Issue #18375: merge with 3.3