backport underscore inflections to 4.1 stable

Respect nested acronym inflections as handled on edge

Fixes #17193