re #878 - Improved form validation
Merge branch 'feature/878-bin' into staging