issue #20864: clean up diffs