Fixed
Merge branch 'hotfix/phpmd_fixes' into develop