PDI-9965 - fixing circular reference issue with hdp13