load-order-with-lock

This was applied to some of the newer branches but not 2-0.