diff --git a/db/demo.tar b/db/demo.tar
index 2c596e394..bb85d7e53 100644
Binary files a/db/demo.tar and b/db/demo.tar differ
diff --git a/src/services/attributes.js b/src/services/attributes.js
index 007f075ed..876ae3c13 100644
--- a/src/services/attributes.js
+++ b/src/services/attributes.js
@@ -19,6 +19,8 @@ const BUILTIN_ATTRIBUTES = [
     { type: 'label', name: 'appTheme' },
     { type: 'label', name: 'hidePromotedAttributes' },
     { type: 'label', name: 'readOnly' },
+    { type: 'label', name: 'cssClass' },
+    { type: 'label', name: 'iconClass' },
     { type: 'label', name: 'run', isDangerous: true },
     { type: 'label', name: 'customRequestHandler', isDangerous: true },
     { type: 'label', name: 'customResourceProvider', isDangerous: true },
diff --git a/src/services/note_revisions.js b/src/services/note_revisions.js
index 8548bf9f8..02a567b47 100644
--- a/src/services/note_revisions.js
+++ b/src/services/note_revisions.js
@@ -7,6 +7,10 @@ const dateUtils = require('../services/date_utils');
  * @param {Note} note
  */
 async function protectNoteRevisions(note) {
+    if (await note.hasLabel('disableVersioning')) {
+        return;
+    }
+
     for (const revision of await note.getRevisions()) {
         if (note.isProtected !== revision.isProtected) {
             const content = await revision.getContent();