Issue #27180: Merge from 3.5