Merge branch 'auth_compat'