Merge branch 'master' into develop
Database and database user changes
Merge branch 'develop'