issue #20906: implemented some of Travis's suggestions
Merge branch '20906' into 20906b