Merge "Refactor lock/unlock"