Merge "Use std::map for fallback keys" into udc-dev