Revert BC breaking changes, useing formOptions instead
Merge branch 'master' into feature-split_views

Conflicts:
	Resources/doc/support-and-contribution/upgrade-notes.md