Issue Issue #15663: merge from 3.3