Issue #29381: merge with 3.6