[MERGE] Fix mode change diffs