diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp
index 6bebe14b76..548e29ab5b 100644
--- a/src/libslic3r/GCode/WipeTower2.cpp
+++ b/src/libslic3r/GCode/WipeTower2.cpp
@@ -781,7 +781,49 @@ std::vector<WipeTower::ToolChangeResult> WipeTower2::prime(
 
 	return results;
 }
+#define FLAVOR_IS(val) this->m_gcode_flavor == val
+#define FLAVOR_IS_NOT(val) this->m_gcode_flavor != val
 
+std::string WipeTower2::set_preheat_temperature(unsigned int temperature, bool wait, int tool) 
+{
+    if (wait && (FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfSailfish)))
+        return "";
+    
+    std::string code, comment;
+    if (wait && FLAVOR_IS_NOT(gcfTeacup) && FLAVOR_IS_NOT(gcfRepRapFirmware)) {
+        code = "M109";
+        comment = "set nozzle temperature and wait for it to be reached";
+    } else {
+        if (FLAVOR_IS(gcfRepRapFirmware)) { // M104 is deprecated on RepRapFirmware
+            code = "G10";
+        } else {
+            code = "M104";
+        }
+        comment = "preheat next nozzle";
+    }
+    
+    std::ostringstream gcode;
+    gcode << code << " ";
+    if (FLAVOR_IS(gcfMach3) || FLAVOR_IS(gcfMachinekit)) {
+        gcode << "P";
+    } else {
+        gcode << "S";
+    }
+    gcode << temperature;
+    if (tool != -1) {
+        if (FLAVOR_IS(gcfRepRapFirmware)) {
+            gcode << " P" << tool;
+        } else {
+            gcode << " T" << tool;
+        }
+    }
+    gcode << " ; " << comment << "\n";
+    
+    if ((FLAVOR_IS(gcfTeacup) || FLAVOR_IS(gcfRepRapFirmware)) && wait)
+        gcode << "M116 ; wait for temperature to be reached\n";
+    
+    return gcode.str();
+}
 WipeTower::ToolChangeResult WipeTower2::tool_change(size_t tool)
 {
     size_t old_tool = m_current_tool;
@@ -836,9 +878,12 @@ WipeTower::ToolChangeResult WipeTower2::tool_change(size_t tool)
 
     // Ram the hot material out of the melt zone, retract the filament into the cooling tubes and let it cool.
     if (tool != (unsigned int)-1){ 			// This is not the last change.
+        auto new_tool_temp = is_first_layer() ? m_filpar[tool].first_layer_temperature : m_filpar[tool].temperature;
+        // Orca: pre-heat next tool, it's a temperary solution before impelment the proper preheat.
+        writer.append(set_preheat_temperature(new_tool_temp, false, tool));
         toolchange_Unload(writer, cleaning_box, m_filpar[m_current_tool].material,
                           (is_first_layer() ? m_filpar[m_current_tool].first_layer_temperature : m_filpar[m_current_tool].temperature),
-                          (is_first_layer() ? m_filpar[tool].first_layer_temperature : m_filpar[tool].temperature));
+                          new_tool_temp);
         toolchange_Change(writer, tool, m_filpar[tool].material); // Change the tool, set a speed override for soluble and flex materials.
         toolchange_Load(writer, cleaning_box);
         writer.travel(writer.x(), writer.y()-m_perimeter_width); // cooling and loading were done a bit down the road
diff --git a/src/libslic3r/GCode/WipeTower2.hpp b/src/libslic3r/GCode/WipeTower2.hpp
index 07c5ca330f..1d37cbe791 100644
--- a/src/libslic3r/GCode/WipeTower2.hpp
+++ b/src/libslic3r/GCode/WipeTower2.hpp
@@ -255,6 +255,8 @@ private:
     // Goes through m_plan, calculates border and finish_layer extrusions and subtracts them from last wipe
     void save_on_last_wipe();
 
+	// Orca: temp help function to set temperature
+    std::string set_preheat_temperature(unsigned int temperature, bool wait, int tool);
 
     // to store information about tool changes for a given layer
 	struct WipeTowerInfo{