Completed form and model validation
Merge remote branch 'upstream/develop' into develop