Merge "Split ManagerDefault into manager and engine"