fixed before auth
Merge branch 'develop'