Issue #20104:first pass