[Finishes #40362793] Project-locks applied correctly