PIM-2672 : PMD