[#71587328] Adding support for partner-mapping API changes.
[#71587328] Implementing the partner-mapping changes.