Completing the user form definition
Merge branch 'origin/master'