Merge pull request #22165 from eileenmcnaughton/no_escape