Issue #27993: Merge plural fixes from 3.5