issue #20524: tests pass