Merge branch 'master' into next58

# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js

src/public/app/menus/context_menu.js

@@ -76,6 +76,10 @@ class ContextMenu {
 
     addItems($parent, items) {
         for (const item of items) {
+            if (!item) {
+                continue;
+            }
+
             if (item.title === '----') {
                 $parent.append($("<div>").addClass("dropdown-divider"));
             } else {