PR #85: Lock file maintenance