Merge pull request #13854 from eileenmcnaughton/lock