Merging changes from fieldcapture.