PMDP-571 DP Policy link fixes