PDI-9965 - further ivyization of hdp13 shim