Merge branch 'auth_type'