Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5