complete name for the class
Merge branch 'hotfix/issue-mpj'