Merge "Fix Dependency Injection IdManager appears to have to have a LockManager"