Merge branch 'ff/auth'