Merge from XForms.