Merge "Move position of System user pre-condition check in CreateAndManageUser method" into main