Issue #21386: Merge from 3.5