Merge "Remove field prefixes."