Merge branch 'pmd-report'