Merge "Fix disappearance of patch headers when compared patches are identical"