Merge "Refactor the VDM locks" into main