CLS-5 #comment Add classic
CLS-5 #resolve-issue Merge branch 'classic' into master