Merge "Normalize JSON attributes during update"