Merge branch 'release/1.6.0'
fix classifier
Merge branch 'hotfix/fix_classifier' into develop