issue #21099: Merge to master