Bug 17913: Fix the new field tag in merge when changing type