Merge branch 'hotfix/user-centres-fixes-2'
Manual positioing
Merge branch 'hotfix/user-centres-fixes-3' into develop