Only apply form changes when mode is 'live' or 'test'
Merge branch 'develop'