issue #22241: cleanup diffs