Merge pull request #1353 from matrix-israel/form_grom_edit_fix