PIM-2672 : fix PMD + CS