Issue #25764: Merge subprocess fix from 3.4 into 3.5