PDI-10991 - CDH 5.0 shim implementation