add class
Merge branch 'hotfix/hotfixfea' into develop