Backport #1792 to 2.3
Backport #1809 to 2.3 (actually creating the method)
Merge remote-tracking branch 'origin/feature/pr_1792_23' into temp/alma
Merge remote-tracking branch 'origin/feature/move_create_user_23' into temp/alma