issue #19550: More progress