[GAIA BUG946750-FORM] - Form separation
Merge pull request #332 from michalbe/Bug946750-form-temp

[GAIA BUG946750-FORM] - Form separation