We will create a custom storage wrapper for types matching std::map<boost::optional<TenantId>, T>, where T is a type defined in IDL with ClusterServerParameter as a chained struct. This storage wrapper will require TenantId to be passed in for set and get, and it will access the map correctly based on TenantId.