Few fix and improvements related to PDM and Nox

Merge request reports

Loading