PDI-10803: Initial changes for the mapr30 shim.