Issue #27581: Merge overflow fix from 3.5