Merge "Update diff files which break benchmark suite"