synching XForms part to master