Merge pull request #18045 from eileenmcnaughton/sleep