Issue #29371: merge with 3.5