Merge "Restrict creation of secondary users" into rvc-dev