tweaks to ensure consistency of form output in FF
Merge branch 'develop'