CGP-21 Bugs/Issues with CPD extension - CPD approved
Merge branch 'CGP-21'