Fix consultant being lost when saving invalid form (resolves OE-3126)
Merge branch 'master' into develop