Issue #20387: Merge with 3.5