Issue #19088: Merge with 3.3.