PDI-11582: Add initial hdp21 shim