Merge branch 'develop' into release/1.8.0

client/src/components/vbox.component.jsx

@@ -329,7 +329,9 @@ class Vbox extends preact.Component {
                 <label
                     draggable='true'
                     onDragStart={ev => ev.dataTransfer.setData('text', '')}
-                    onDragEnd={() => combinerChange([])}>
+                    onDragEnd={() => {
+                        if (combiner.length === 1) combinerChange([]);
+                    }}>
                     <button
                         class={classes}
                         onMouseOver={e => vboxHover(e, v)}