Fixed file save bug breaking tests.
Merge branch 'appForms' into 5901_number_validation