Merge "Add "m" prefix to fields"