work on Authentication - result
Merge branch 'dev-local'