Merge pull request #16142 from eileenmcnaughton/deadlock_err