Merge branches 'fix-editor-classes' and 'fix-stylesheets-dir' into tmp