Merge "Split ManagerDefault into Manager and ManagerDefinitions"