Issue #17838: merge with 3.3