issue #19800: clean up diff