Issue #18326: merge with 3.3