Merge branch 'improve-auth' into next