Merge branch 'init-auth-fail'