start using new DatasetLock (left a todo) #3857