Merge "Add "modifyExtensionField" utility function"