issue #19550: more progress.