Merge "stability pdp-d review comments"