Merge branch 'bugfix/change_password' into 'develop'