PDI-11306: Initial mapr31 shim