Issue #16244: Merged change from 3.2.