Merge branch 'settings-users-split' into test