Merge "Add std::map implementation for cd entry map"