Merge "Ability to set lock_path"