Remove $contentclass
Merge branch 'master' into ESSENTIAL_254