Issue #26553: Merge capitalization from 3.5