Add changes required by Nimble lock file support #12104
+140
−55
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.