issue #19456: More rework.