fix unknown class bug
Merge branch 'develop'