brach specific fixes for: Merge branch 'dev_rename_userEntity'