[GAIA BUG946750-FORM] -  merge bug fixed