[GAIA BUG946750-FORM] - Form separation