Merge pull request #32332 from mstanleyjones/1.13.x

Cherry-pick command-line ref improvements