PDI-9647 - IDH23 shim implementation