Merge branch 'fix-1-1-user-role-assignment' into 1-1-fixes