[GAIA] - :crying_cat_face: restore merging logic
Merge pull request #429 from michalbe/Bug946750-form-temp

[GAIA] - restore merging logic