Merge branch 'ext-auth'