Issue #25523: Merge a-to-an corrections from 3.5