Issue #20101: Merge with 3.3