Issue #23406: Merge 3.5 into 3.6