Issue #20875: Merge from 3.3