issue #19827: more touches from john