Merge branch 'hotfix/hotfix'
Class fix
Merge branch 'hotfix/hotfix' into develop