6.2 - User Validations - Completed
Merge conflict