Issue #27445: Merge from 3.5