Add classifiers
Merge branch 'public' into 3000
Add specific classifier for 3K branch
Removed comments on classifiers
Merge branch 'public' into 3000