diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index fda5e6c67a..c49e41a137 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -69,7 +69,7 @@
 // Enable removal of old OpenGL render calls
 #define ENABLE_GLBEGIN_GLEND_REMOVAL (1 && ENABLE_2_5_0_ALPHA1)
 // Enable replace GLIndexedVertexArray with GLModel
-#define ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL (1 && ENABLE_GLBEGIN_GLEND_REMOVAL)
+#define ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL (0 && ENABLE_GLBEGIN_GLEND_REMOVAL)
 // Enable show non-manifold edges
 #define ENABLE_SHOW_NON_MANIFOLD_EDGES (1 && ENABLE_2_5_0_ALPHA1)
 // Enable rework of Reload from disk command
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 36a38accd4..fe31657d33 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -1599,9 +1599,8 @@ void GLGizmoEmboss::do_translate(const Vec3d &relative_move)
     assert(m_volume->text_configuration.has_value());
     Selection &selection = m_parent.get_selection();
     assert(!selection.is_empty());
-    selection.start_dragging();
+    selection.setup_cache();
     selection.translate(relative_move, ECoordinatesType::Local);
-    selection.stop_dragging();
 
     std::string snapshot_name; // empty meand no store undo / redo
     // NOTE: it use L instead of _L macro because prefix _ is appended inside
@@ -1616,9 +1615,8 @@ void GLGizmoEmboss::do_rotate(float relative_z_angle)
     assert(m_volume->text_configuration.has_value());
     Selection &selection = m_parent.get_selection();
     assert(!selection.is_empty());
-    selection.start_dragging();
+    selection.setup_cache();
     selection.rotate(Vec3d(0., 0., relative_z_angle), TransformationType::Local);
-    selection.stop_dragging();
 
     std::string snapshot_name; // empty meand no store undo / redo
     // NOTE: it use L instead of _L macro because prefix _ is appended
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
index 6801ee112a..512f564af2 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
@@ -66,9 +66,8 @@ protected:
     void on_set_state() override;    
     
     void on_set_hover_id() override{ m_rotate_gizmo.set_hover_id(m_hover_id); }
-    void on_enable_grabber(unsigned int id) override { m_rotate_gizmo.enable_grabber(0); }
-    void on_disable_grabber(unsigned int id) override { m_rotate_gizmo.disable_grabber(0); }
-    void on_update(const UpdateData &data) override { m_rotate_gizmo.update(data); }
+    void on_enable_grabber(unsigned int id) override { m_rotate_gizmo.enable_grabber(); }
+    void on_disable_grabber(unsigned int id) override { m_rotate_gizmo.disable_grabber(); }
     void on_start_dragging() override;
     void on_stop_dragging() override;
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
index f698a3c587..1c97a73d83 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
@@ -68,6 +68,8 @@ public:
 
     std::string get_tooltip() const override;
 
+    void set_group_id(int group_id) { m_group_id = group_id; }
+
     void start_dragging();
     void stop_dragging();