Merge "Minor fixes to User and ApiQueryUsers"