Merge "Adding IdManager/LockManager and related Changes"