issue #20445: cleanup