PDI-9965 - ivyizing hdp 12 shim