Merge pull request #17347 from eileenmcnaughton/status