Merge "Break up dirs lock to individual dirs" into main