issue #20906: first draft testing complete