Merge pull request #17372 from eileenmcnaughton/opts