This is new commit to a new branch dev-auth
Merge branch 'dev-auth' into dev