[GAIA BUG946750-FORM] -  merge bug fixed
Merge pull request #423 from michalbe/Bug946750-form-temp

[GAIA BUG946750-FORM] -  merge bug fixed