Merge "Fix Sonar Issues in models-pdp"