diff --git a/lib/Slic3r/Test.pm b/lib/Slic3r/Test.pm
index 8d2a79f2a..d0696aab0 100644
--- a/lib/Slic3r/Test.pm
+++ b/lib/Slic3r/Test.pm
@@ -139,7 +139,6 @@ sub mesh {
     
     my $mesh = Slic3r::TriangleMesh->new;
     $mesh->ReadFromPerl($vertices, $facets);
-    $mesh->repair;
     $mesh->scale_xyz(Slic3r::Pointf3->new(@{$params{scale_xyz}})) if $params{scale_xyz};
     $mesh->translate(@{$params{translate}}) if $params{translate};
     return $mesh;
diff --git a/resources/data/hints.ini b/resources/data/hints.ini
index e7b1bb681..a79a8228a 100644
--- a/resources/data/hints.ini
+++ b/resources/data/hints.ini
@@ -48,6 +48,7 @@
 # enabled_tags = ...
 # disabled_tags = ...
 # supported tags are: simple; advanced; expert; FFF; MMU; SLA; Windows; Linux; OSX;
+# and all filament types:  PLA; PET; ABS; ASA; FLEX; HIPS; EDGE; NGEN; NYLON; PVA; PC; PP; PEI; PEEK; PEKK; POM; PSU; PVDF; SCAFF; 
 # Tags are case sensitive. 
 # FFF is affirmative for both one or more extruder printers.
 # Algorithm shows hint only if ALL enabled tags are affirmative. (so never do enabled_tags = FFF; SLA;)
diff --git a/resources/icons/exclamation_manifold.svg b/resources/icons/exclamation_manifold.svg
new file mode 100644
index 000000000..cd8ba5954
--- /dev/null
+++ b/resources/icons/exclamation_manifold.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#808080" d="M8,11c-0.55,0-1-0.45-1-1V7c0-0.55,0.45-1,1-1s1,0.45,1,1v3C9,10.55,8.55,11,8,11z"/>
+	</g>
+	<g>
+		<circle fill="#808080" cx="8" cy="13" r="1"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M15,15.5H1c-0.18,0-0.34-0.09-0.43-0.24c-0.09-0.15-0.09-0.34-0.01-0.49l7-13c0.17-0.32,0.71-0.32,0.88,0
+			l7,13c0.08,0.16,0.08,0.34-0.01,0.49C15.34,15.41,15.18,15.5,15,15.5z M1.84,14.5h12.33L8,3.05L1.84,14.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/notification_info.svg b/resources/icons/notification_info.svg
new file mode 100644
index 000000000..e562112b6
--- /dev/null
+++ b/resources/icons/notification_info.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   height="200"
+   width="200"
+   sodipodi:docname="notification_info.svg"
+   xml:space="preserve"
+   enable-background="new 0 0 100 100"
+   viewBox="0 0 200 200"
+   y="0px"
+   x="0px"
+   id="warning"
+   version="1.0"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs17" /><sodipodi:namedview
+   inkscape:current-layer="warning"
+   inkscape:window-maximized="1"
+   inkscape:window-y="-11"
+   inkscape:window-x="-11"
+   inkscape:cy="117.65848"
+   inkscape:cx="108.69674"
+   inkscape:zoom="5.04"
+   showgrid="false"
+   id="namedview15"
+   inkscape:window-height="2066"
+   inkscape:window-width="3840"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   guidetolerance="10"
+   gridtolerance="10"
+   objecttolerance="10"
+   borderopacity="1"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   inkscape:document-rotation="0" />
+
+
+
+<g
+   id="g8"
+   transform="matrix(2,0,0,2,0.17117674,0.68464711)"
+   style="fill:#ed6b21;fill-opacity:1"><path
+     id="path6"
+     d="m 40.1,43.5 c 4.5,-1.2 8.2,-1.7 11,-1.7 1.7,0 3,0.3 4,0.9 0.9,0.6 1.4,1.5 1.4,2.8 0,0.5 -0.1,1.1 -0.2,1.6 l -5,23.9 c -0.1,0.7 -0.2,1.1 -0.2,1.4 0,1 0.4,1.7 1.3,2 0.8,0.3 2.4,0.5 4.6,0.5 l -0.2,1.8 c -4.3,1.1 -7.8,1.6 -10.5,1.6 -1.9,0 -3.3,-0.4 -4.4,-1.1 -1,-0.7 -1.6,-1.8 -1.6,-3.3 0,-0.7 0.1,-1.6 0.3,-2.7 l 4.6,-22 c 0.2,-1 0.3,-1.7 0.3,-2 0,-0.7 -0.3,-1.2 -0.9,-1.4 C 44,45.5 42.4,45.4 39.7,45.4 Z M 59.2,28.4 c 0,1.7 -0.5,3.1 -1.6,4.2 -1.1,1.1 -2.4,1.6 -4,1.6 -1.5,0 -2.8,-0.5 -3.8,-1.5 -1,-1 -1.5,-2.3 -1.5,-3.9 0,-1.8 0.5,-3.2 1.6,-4.2 1.1,-1 2.4,-1.5 4,-1.5 1.5,0 2.8,0.5 3.8,1.4 1,0.9 1.5,2.2 1.5,3.9 z"
+     class="st1"
+     style="fill:#ed6b21;fill-opacity:1" /></g><path
+   id="path853"
+   d="m 16.939336,52.048564 c 0.24576,-0.15442 19.08533,-11.001046 41.86572,-24.103596 L 100.22396,4.1221459 142.03917,28.183626 183.85441,52.245107 V 100.734 149.2229 l -41.81468,24.06212 -41.81467,24.06214 -41.816284,-24.06216 -41.81626,-24.06216 -0.05,-48.44676 -0.05,-48.446739 z M 63.764716,163.5414 c 19.88816,11.44426 36.295164,20.80774 36.460014,20.80774 0.16481,0 16.57129,-9.36332 36.45875,-20.80738 l 36.15903,-20.80738 V 100.73468 58.734992 L 136.68178,37.925746 C 116.79341,26.480662 100.38715,17.116638 100.22347,17.116804 100.05968,17.116972 83.653536,26.48106 63.765126,37.925887 l -36.16072,20.808776 v 41.999497 41.9995 z"
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.198413" /><path
+   id="path855"
+   d="m 89.952923,157.02042 c -4.242772,-0.58044 -7.113036,-2.32486 -8.380448,-5.09326 -0.626294,-1.368 -0.807444,-3.89074 -0.464458,-6.46814 0.1277,-0.95968 2.419926,-12.20538 5.093816,-24.99044 2.67389,-12.78508 4.908156,-23.917618 4.965016,-24.738958 0.115,-1.6621 -0.189601,-2.54084 -1.114721,-3.21606 -0.792772,-0.57856 -2.966462,-0.9222 -6.787666,-1.07302 -3.481347,-0.1374 -3.555832,-0.1494 -3.458944,-0.5573 0.05446,-0.22926 0.206042,-0.97334 0.336845,-1.6535 0.1308,-0.68016 0.338118,-1.31832 0.4607,-1.41814 0.28243,-0.22998 6.4844,-1.66782 9.46857,-2.19514 5.863452,-1.0361 12.531417,-1.47854 15.428597,-1.02374 5.36116,0.84161 7.82828,3.38728 7.50956,7.74872 -0.0602,0.82388 -2.44364,12.614038 -5.2965,26.200338 -3.08108,14.67312 -5.23336,25.36606 -5.30112,26.33702 -0.24186,3.46504 0.94802,4.64856 5.32416,5.29562 1.15984,0.1716 3.06554,0.31182 4.23488,0.31182 h 2.1261 l -0.1262,1.04166 c -0.0694,0.57292 -0.174,1.37074 -0.23232,1.77292 l -0.1062,0.73126 -2.51448,0.59446 c -8.31236,1.96515 -17.063901,2.95498 -21.165277,2.39389 z"
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.198413" /><path
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.280598"
+   d="m 103.80449,68.371429 c -4.85388,-1.747057 -7.401434,-6.318219 -6.705139,-12.031262 0.68816,-5.646301 5.025269,-9.262423 11.052899,-9.215502 4.20991,0.03277 7.4957,1.946636 9.16606,5.33893 0.89045,1.808402 0.93519,2.048665 0.92966,4.992684 -0.007,3.886952 -0.60744,5.58627 -2.81498,7.970671 -2.18267,2.35755 -4.19782,3.227419 -7.70164,3.324532 -1.90628,0.05284 -3.02496,-0.05544 -3.92686,-0.380053 z"
+   id="path859" /><path
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.280598"
+   d="m 88.159837,156.51971 c -4.689261,-1.3224 -6.765722,-3.65088 -6.999725,-7.84929 -0.143463,-2.57397 -0.367006,-1.35766 5.236874,-28.49422 2.02374,-9.79989 3.976706,-19.42817 4.339925,-21.396181 1.189159,-6.443166 0.608576,-7.052275 -7.07692,-7.424629 -1.896078,-0.09186 -3.506416,-0.262489 -3.578529,-0.37917 -0.07211,-0.116682 0.01749,-0.855929 0.199113,-1.642772 0.380336,-1.647704 6.64e-4,-1.47536 6.265635,-2.844151 5.6684,-1.238451 9.941962,-1.750196 14.87169,-1.780835 6.11275,-0.03799 8.21381,0.630882 10.35608,3.296884 0.84162,1.047378 0.86697,1.161816 0.83925,3.788072 -0.0245,2.316986 -0.5437,5.179915 -3.59555,19.824542 -7.12659,34.19777 -7.24867,34.91174 -6.23405,36.46024 0.25629,0.39114 0.76211,0.90521 1.12406,1.14236 1.05449,0.69093 4.30303,1.25008 7.29332,1.25534 l 2.76816,0.005 -0.20111,1.61344 c -0.11061,0.88739 -0.33162,1.69456 -0.49112,1.79371 -0.42321,0.26308 -8.03018,1.8551 -11.29784,2.36446 -4.118692,0.64201 -11.953193,0.79357 -13.819263,0.26733 z"
+   id="path861" /><path
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.204365"
+   d="M 14.442311,50.587986 C 14.695444,50.428934 34.100201,39.256909 57.564008,25.761283 L 100.22547,1.2237759 143.29514,26.0071 l 43.0697,24.783326 v 49.943554 49.94357 l -43.06912,24.78398 -43.06911,24.78401 -43.07077,-24.78403 -43.070753,-24.78402 -0.0515,-49.90017 -0.0515,-49.900133 z M 62.672458,165.4256 c 20.484805,11.78759 37.384012,21.43197 37.553812,21.43197 0.16975,0 17.06843,-9.64422 37.55251,-21.4316 l 37.2438,-21.4316 V 100.73468 57.475007 L 137.77703,36.041484 c -20.48502,-11.788437 -37.38347,-21.433381 -37.55206,-21.43321 -0.1687,1.73e-4 -17.067028,9.645183 -37.55209,21.433355 L 25.427333,57.474668 v 43.259482 43.25948 z"
+   id="path853-2" /><path
+   style="opacity:0.999;fill:#ed6b21;fill-opacity:1;stroke-width:0.18254"
+   d="M 23.59806,55.943454 C 23.824159,55.801388 41.156564,45.822492 62.114522,33.768146 l 38.105398,-21.916997 38.46998,22.136562 38.47002,22.136563 v 44.609776 44.60979 l -38.4695,22.13715 -38.46949,22.13717 -38.470985,-22.13719 -38.470959,-22.13718 -0.046,-44.57102 -0.046,-44.571001 z M 66.67741,158.51686 c 18.297107,10.52872 33.39156,19.14312 33.54322,19.14312 0.15162,0 15.24558,-8.61425 33.54204,-19.14279 L 167.02898,139.3744 V 100.73468 62.094968 L 133.7611,42.950461 C 115.4638,32.420984 100.37005,23.806082 100.21947,23.806235 100.06878,23.806389 84.975124,32.42135 66.677787,42.950591 L 33.409924,62.094665 v 38.639535 38.63954 z"
+   id="path853-0" /></svg>
diff --git a/resources/icons/white/exclamation_manifold.svg b/resources/icons/white/exclamation_manifold.svg
new file mode 100644
index 000000000..a18590167
--- /dev/null
+++ b/resources/icons/white/exclamation_manifold.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FFFFFF" d="M8,11c-0.55,0-1-0.45-1-1V7c0-0.55,0.45-1,1-1s1,0.45,1,1v3C9,10.55,8.55,11,8,11z"/>
+	</g>
+	<g>
+		<circle fill="#FFFFFF" cx="8" cy="13" r="1"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M15,15.5H1c-0.18,0-0.34-0.09-0.43-0.24c-0.09-0.15-0.09-0.34-0.01-0.49l7-13c0.17-0.32,0.71-0.32,0.88,0
+			l7,13c0.08,0.16,0.08,0.34-0.01,0.49C15.34,15.41,15.18,15.5,15,15.5z M1.84,14.5h12.33L8,3.05L1.84,14.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot
index 58ed3370e..0cd7076f7 100644
--- a/resources/localization/PrusaSlicer.pot
+++ b/resources/localization/PrusaSlicer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-03 21:27+0100\n"
+"POT-Creation-Date: 2021-10-05 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,58 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:45 src/slic3r/GUI/AboutDialog.cpp:299
+#: src/slic3r/GUI/AboutDialog.cpp:45 src/slic3r/GUI/AboutDialog.cpp:303
 msgid "Portions copyright"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:135 src/slic3r/GUI/AboutDialog.cpp:263
+#: src/slic3r/GUI/AboutDialog.cpp:139 src/slic3r/GUI/AboutDialog.cpp:267
 msgid "Copyright"
 msgstr ""
 
 #. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:137
+#: src/slic3r/GUI/AboutDialog.cpp:141
 msgid ""
 "License agreements of all following programs (libraries) are part of "
 "application license agreement"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:206
+#: src/slic3r/GUI/AboutDialog.cpp:210
 #, possible-c-format
 msgid "About %s"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:238 src/slic3r/GUI/AboutDialog.cpp:361
-#: src/slic3r/GUI/GUI_App.cpp:243 src/slic3r/GUI/MainFrame.cpp:151
+#: src/slic3r/GUI/AboutDialog.cpp:242 src/slic3r/GUI/AboutDialog.cpp:367
+#: src/slic3r/GUI/GUI_App.cpp:255
 msgid "Version"
 msgstr ""
 
 #. TRN "Slic3r _is licensed under the_ License"
-#: src/slic3r/GUI/AboutDialog.cpp:265 src/slic3r/GUI/GUI_App.cpp:248
+#: src/slic3r/GUI/AboutDialog.cpp:269 src/slic3r/GUI/GUI_App.cpp:261
 msgid "is licensed under the"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:266 src/slic3r/GUI/GUI_App.cpp:248
+#: src/slic3r/GUI/AboutDialog.cpp:270 src/slic3r/GUI/GUI_App.cpp:261
 msgid "GNU Affero General Public License, version 3"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:267
+#: src/slic3r/GUI/AboutDialog.cpp:271
 msgid ""
 "PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap "
 "community."
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:268
+#: src/slic3r/GUI/AboutDialog.cpp:272
 msgid ""
 "Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, "
 "Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and "
 "numerous others."
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:304
+#: src/slic3r/GUI/AboutDialog.cpp:308
 msgid "Copy Version Info"
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:78
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:79
 #, possible-c-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -77,228 +77,266 @@ msgid ""
 "and we would be glad if you reported it."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:163
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:183
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
+msgid ""
+"Please save your project and restart PrusaSlicer. We would be glad if you "
+"reported the issue."
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:162
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:204
+msgid "Slicing complete"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:199
+msgid "Masked SLA file exported to %1%"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:286
+msgid "Access violation"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:288
+msgid "Illegal instruction"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:290
+msgid "Divide by zero"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:292
+msgid "Overflow"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:294
+msgid "Underflow"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:297
+msgid "Floating reserved operand"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:300
+msgid "Stack overflow"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:659
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:726
+msgid "Running post-processing scripts"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:690
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:710
 msgid "Unknown error occured during exporting G-code."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:168
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:695
 msgid ""
 "Copying of the temporary G-code to the output G-code failed. Maybe the SD "
 "card is write locked?\n"
 "Error message: %1%"
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:171
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:698
 msgid ""
 "Copying of the temporary G-code to the output G-code failed. There might be "
 "problem with target device, please try exporting again or using different "
 "device. The corrupted output G-code is at %1%.tmp."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:174
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:701
 msgid ""
 "Renaming of the G-code after copying to the selected destination folder has "
 "failed. Current path is %1%.tmp. Please try exporting again."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:177
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:704
 msgid ""
 "Copying of the temporary G-code has finished but the original code at %1% "
 "couldn't be opened during copy check. The output G-code is at %2%.tmp."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:180
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:707
 msgid ""
 "Copying of the temporary G-code has finished but the exported code couldn't "
 "be opened during copy check. The output G-code is at %1%.tmp."
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:187
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:536
-msgid "Running post-processing scripts"
-msgstr ""
-
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:189
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:715
 msgid "G-code file exported to %1%"
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:194
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:243
-msgid "Slicing complete"
-msgstr ""
-
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:238
-msgid "Masked SLA file exported to %1%"
-msgstr ""
-
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:539
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:729
 msgid "Copying of the temporary G-code to the output G-code failed"
 msgstr ""
 
-#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:562
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:751
 msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:93
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:221 src/slic3r/GUI/Plater.cpp:162
-#: src/slic3r/GUI/Tab.cpp:2550
+#: src/slic3r/GUI/BedShapeDialog.cpp:92
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:219 src/slic3r/GUI/Plater.cpp:171
+#: src/slic3r/GUI/Tab.cpp:2686
 msgid "Size"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:94
+#: src/slic3r/GUI/BedShapeDialog.cpp:93
 msgid "Origin"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:95 src/libslic3r/PrintConfig.cpp:796
+#: src/slic3r/GUI/BedShapeDialog.cpp:94 src/libslic3r/PrintConfig.cpp:981
 msgid "Diameter"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:110
+#: src/slic3r/GUI/BedShapeDialog.cpp:109
 msgid "Size in X and Y of the rectangular plate."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:121
+#: src/slic3r/GUI/BedShapeDialog.cpp:120
 msgid ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:129 src/slic3r/GUI/ConfigWizard.cpp:242
-#: src/slic3r/GUI/ConfigWizard.cpp:1366 src/slic3r/GUI/ConfigWizard.cpp:1380
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:88
-#: src/slic3r/GUI/GCodeViewer.cpp:3647 src/slic3r/GUI/GCodeViewer.cpp:3653
-#: src/slic3r/GUI/GCodeViewer.cpp:3661 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179
+#: src/slic3r/GUI/BedShapeDialog.cpp:128 src/slic3r/GUI/ConfigWizard.cpp:258
+#: src/slic3r/GUI/ConfigWizard.cpp:1466 src/slic3r/GUI/ConfigWizard.cpp:1480
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:100
+#: src/slic3r/GUI/GCodeViewer.cpp:3448 src/slic3r/GUI/GCodeViewer.cpp:3454
+#: src/slic3r/GUI/GCodeViewer.cpp:3462 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188
 #: src/slic3r/GUI/GUI_ObjectLayers.cpp:145
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:399
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:467
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:468
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:96
-#: src/slic3r/GUI/WipeTowerDialog.cpp:85 src/libslic3r/PrintConfig.cpp:77
-#: src/libslic3r/PrintConfig.cpp:84 src/libslic3r/PrintConfig.cpp:95
-#: src/libslic3r/PrintConfig.cpp:135 src/libslic3r/PrintConfig.cpp:244
-#: src/libslic3r/PrintConfig.cpp:303 src/libslic3r/PrintConfig.cpp:328
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:410
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:590
-#: src/libslic3r/PrintConfig.cpp:601 src/libslic3r/PrintConfig.cpp:619
-#: src/libslic3r/PrintConfig.cpp:799 src/libslic3r/PrintConfig.cpp:1085
-#: src/libslic3r/PrintConfig.cpp:1094 src/libslic3r/PrintConfig.cpp:1347
-#: src/libslic3r/PrintConfig.cpp:1528 src/libslic3r/PrintConfig.cpp:1589
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1625
-#: src/libslic3r/PrintConfig.cpp:1683 src/libslic3r/PrintConfig.cpp:1693
-#: src/libslic3r/PrintConfig.cpp:1818 src/libslic3r/PrintConfig.cpp:1826
-#: src/libslic3r/PrintConfig.cpp:1867 src/libslic3r/PrintConfig.cpp:1875
-#: src/libslic3r/PrintConfig.cpp:1885 src/libslic3r/PrintConfig.cpp:1893
-#: src/libslic3r/PrintConfig.cpp:1901 src/libslic3r/PrintConfig.cpp:1964
-#: src/libslic3r/PrintConfig.cpp:2230 src/libslic3r/PrintConfig.cpp:2301
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2464
-#: src/libslic3r/PrintConfig.cpp:2543 src/libslic3r/PrintConfig.cpp:2550
-#: src/libslic3r/PrintConfig.cpp:2557 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2597 src/libslic3r/PrintConfig.cpp:2607
-#: src/libslic3r/PrintConfig.cpp:2767 src/libslic3r/PrintConfig.cpp:2801
-#: src/libslic3r/PrintConfig.cpp:2940 src/libslic3r/PrintConfig.cpp:2949
-#: src/libslic3r/PrintConfig.cpp:2958 src/libslic3r/PrintConfig.cpp:2968
-#: src/libslic3r/PrintConfig.cpp:3033 src/libslic3r/PrintConfig.cpp:3043
-#: src/libslic3r/PrintConfig.cpp:3055 src/libslic3r/PrintConfig.cpp:3075
-#: src/libslic3r/PrintConfig.cpp:3085 src/libslic3r/PrintConfig.cpp:3095
-#: src/libslic3r/PrintConfig.cpp:3113 src/libslic3r/PrintConfig.cpp:3128
-#: src/libslic3r/PrintConfig.cpp:3142 src/libslic3r/PrintConfig.cpp:3153
-#: src/libslic3r/PrintConfig.cpp:3166 src/libslic3r/PrintConfig.cpp:3211
-#: src/libslic3r/PrintConfig.cpp:3221 src/libslic3r/PrintConfig.cpp:3230
-#: src/libslic3r/PrintConfig.cpp:3240 src/libslic3r/PrintConfig.cpp:3256
-#: src/libslic3r/PrintConfig.cpp:3280
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:410
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:478
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:479
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:134
+#: src/slic3r/GUI/WipeTowerDialog.cpp:116 src/libslic3r/PrintConfig.cpp:240
+#: src/libslic3r/PrintConfig.cpp:257 src/libslic3r/PrintConfig.cpp:264
+#: src/libslic3r/PrintConfig.cpp:426 src/libslic3r/PrintConfig.cpp:486
+#: src/libslic3r/PrintConfig.cpp:512 src/libslic3r/PrintConfig.cpp:587
+#: src/libslic3r/PrintConfig.cpp:595 src/libslic3r/PrintConfig.cpp:645
+#: src/libslic3r/PrintConfig.cpp:775 src/libslic3r/PrintConfig.cpp:786
+#: src/libslic3r/PrintConfig.cpp:804 src/libslic3r/PrintConfig.cpp:984
+#: src/libslic3r/PrintConfig.cpp:1192 src/libslic3r/PrintConfig.cpp:1256
+#: src/libslic3r/PrintConfig.cpp:1265 src/libslic3r/PrintConfig.cpp:1536
+#: src/libslic3r/PrintConfig.cpp:1730 src/libslic3r/PrintConfig.cpp:1791
+#: src/libslic3r/PrintConfig.cpp:1809 src/libslic3r/PrintConfig.cpp:1827
+#: src/libslic3r/PrintConfig.cpp:1888 src/libslic3r/PrintConfig.cpp:1898
+#: src/libslic3r/PrintConfig.cpp:2011 src/libslic3r/PrintConfig.cpp:2020
+#: src/libslic3r/PrintConfig.cpp:2039 src/libslic3r/PrintConfig.cpp:2060
+#: src/libslic3r/PrintConfig.cpp:2068 src/libslic3r/PrintConfig.cpp:2109
+#: src/libslic3r/PrintConfig.cpp:2117 src/libslic3r/PrintConfig.cpp:2127
+#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/PrintConfig.cpp:2143
+#: src/libslic3r/PrintConfig.cpp:2205 src/libslic3r/PrintConfig.cpp:2434
+#: src/libslic3r/PrintConfig.cpp:2503 src/libslic3r/PrintConfig.cpp:2520
+#: src/libslic3r/PrintConfig.cpp:2618 src/libslic3r/PrintConfig.cpp:2627
+#: src/libslic3r/PrintConfig.cpp:2677 src/libslic3r/PrintConfig.cpp:2827
+#: src/libslic3r/PrintConfig.cpp:2915 src/libslic3r/PrintConfig.cpp:2922
+#: src/libslic3r/PrintConfig.cpp:2929 src/libslic3r/PrintConfig.cpp:2943
+#: src/libslic3r/PrintConfig.cpp:2967 src/libslic3r/PrintConfig.cpp:2977
+#: src/libslic3r/PrintConfig.cpp:2987 src/libslic3r/PrintConfig.cpp:3147
+#: src/libslic3r/PrintConfig.cpp:3181 src/libslic3r/PrintConfig.cpp:3320
+#: src/libslic3r/PrintConfig.cpp:3329 src/libslic3r/PrintConfig.cpp:3338
+#: src/libslic3r/PrintConfig.cpp:3348 src/libslic3r/PrintConfig.cpp:3413
+#: src/libslic3r/PrintConfig.cpp:3423 src/libslic3r/PrintConfig.cpp:3435
+#: src/libslic3r/PrintConfig.cpp:3455 src/libslic3r/PrintConfig.cpp:3465
+#: src/libslic3r/PrintConfig.cpp:3475 src/libslic3r/PrintConfig.cpp:3493
+#: src/libslic3r/PrintConfig.cpp:3508 src/libslic3r/PrintConfig.cpp:3522
+#: src/libslic3r/PrintConfig.cpp:3533 src/libslic3r/PrintConfig.cpp:3546
+#: src/libslic3r/PrintConfig.cpp:3591 src/libslic3r/PrintConfig.cpp:3601
+#: src/libslic3r/PrintConfig.cpp:3610 src/libslic3r/PrintConfig.cpp:3620
+#: src/libslic3r/PrintConfig.cpp:3636 src/libslic3r/PrintConfig.cpp:3660
 msgid "mm"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:131
+#: src/slic3r/GUI/BedShapeDialog.cpp:130
 msgid ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:141
+#: src/slic3r/GUI/BedShapeDialog.cpp:140
 msgid "Rectangular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:142
+#: src/slic3r/GUI/BedShapeDialog.cpp:141
 msgid "Circular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:143 src/slic3r/GUI/GUI_Preview.cpp:240
-#: src/libslic3r/ExtrusionEntity.cpp:323 src/libslic3r/ExtrusionEntity.cpp:358
+#: src/slic3r/GUI/BedShapeDialog.cpp:142 src/slic3r/GUI/GUI_Preview.cpp:251
+#: src/libslic3r/ExtrusionEntity.cpp:325 src/libslic3r/ExtrusionEntity.cpp:360
 msgid "Custom"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:145
+#: src/slic3r/GUI/BedShapeDialog.cpp:144
 msgid "Invalid"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:156 src/slic3r/GUI/BedShapeDialog.cpp:222
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2306
+#: src/slic3r/GUI/BedShapeDialog.cpp:155 src/slic3r/GUI/BedShapeDialog.cpp:225
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1682
 msgid "Shape"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:243
+#: src/slic3r/GUI/BedShapeDialog.cpp:249
 msgid "Load shape from STL..."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:292 src/slic3r/GUI/MainFrame.cpp:1826
+#: src/slic3r/GUI/BedShapeDialog.cpp:298 src/slic3r/GUI/GCodeViewer.cpp:3981
+#: src/slic3r/GUI/MainFrame.cpp:2146
 msgid "Settings"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:315
+#: src/slic3r/GUI/BedShapeDialog.cpp:322
 msgid "Texture"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:325 src/slic3r/GUI/BedShapeDialog.cpp:405
+#: src/slic3r/GUI/BedShapeDialog.cpp:332 src/slic3r/GUI/BedShapeDialog.cpp:414
 msgid "Load..."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/BedShapeDialog.cpp:413
-#: src/slic3r/GUI/Tab.cpp:3502
+#: src/slic3r/GUI/BedShapeDialog.cpp:341 src/slic3r/GUI/BedShapeDialog.cpp:422
+#: src/slic3r/GUI/Tab.cpp:3660
 msgid "Remove"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:366 src/slic3r/GUI/BedShapeDialog.cpp:446
+#: src/slic3r/GUI/BedShapeDialog.cpp:374 src/slic3r/GUI/BedShapeDialog.cpp:455
 msgid "Not found:"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:395
+#: src/slic3r/GUI/BedShapeDialog.cpp:404
 msgid "Model"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:563
+#: src/slic3r/GUI/BedShapeDialog.cpp:572
 msgid "Choose an STL file to import bed shape from:"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:570 src/slic3r/GUI/BedShapeDialog.cpp:619
-#: src/slic3r/GUI/BedShapeDialog.cpp:642
+#: src/slic3r/GUI/BedShapeDialog.cpp:579 src/slic3r/GUI/BedShapeDialog.cpp:628
+#: src/slic3r/GUI/BedShapeDialog.cpp:651
 msgid "Invalid file format."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:581
+#: src/slic3r/GUI/BedShapeDialog.cpp:590
 msgid "Error! Invalid model"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:589
+#: src/slic3r/GUI/BedShapeDialog.cpp:598
 msgid "The selected file contains no geometry."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:593
+#: src/slic3r/GUI/BedShapeDialog.cpp:602
 msgid ""
 "The selected file contains several disjoint areas. This is not supported."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:608
+#: src/slic3r/GUI/BedShapeDialog.cpp:617
 msgid "Choose a file to import bed texture from (PNG/SVG):"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:631
+#: src/slic3r/GUI/BedShapeDialog.cpp:640
 msgid "Choose an STL file to import bed model from:"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.hpp:98 src/slic3r/GUI/ConfigWizard.cpp:1325
+#: src/slic3r/GUI/BedShapeDialog.hpp:98 src/slic3r/GUI/ConfigWizard.cpp:1386
 msgid "Bed Shape"
 msgstr ""
 
@@ -330,45 +368,49 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:16
-msgid "Buttons And Text Colors Description"
+#: src/slic3r/GUI/ButtonsDescription.cpp:36
+msgid "Revert color to default"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:36 src/slic3r/GUI/Preferences.cpp:517
+#: src/slic3r/GUI/ButtonsDescription.cpp:51
 msgid "Value is the same as the system value"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:53 src/slic3r/GUI/Preferences.cpp:528
+#: src/slic3r/GUI/ButtonsDescription.cpp:52
 msgid ""
 "Value was changed and is not equal to the system value or the last saved "
 "preset"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:48
+#: src/slic3r/GUI/ButtonsDescription.cpp:56
+msgid "Buttons And Text Colors Description"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigManipulation.cpp:49
 msgid ""
-"Zero layer height is not valid.\n"
+"Layer height is not valid.\n"
 "\n"
 "The layer height will be reset to 0.01."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:49
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1387
-#: src/libslic3r/PrintConfig.cpp:73
+#: src/slic3r/GUI/ConfigManipulation.cpp:51
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:29 src/slic3r/GUI/Tab.cpp:1436
+#: src/libslic3r/PrintConfig.cpp:253
 msgid "Layer height"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:60
+#: src/slic3r/GUI/ConfigManipulation.cpp:62
 msgid ""
-"Zero first layer height is not valid.\n"
+"First layer height is not valid.\n"
 "\n"
 "The first layer height will be reset to 0.01."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:61 src/libslic3r/PrintConfig.cpp:994
+#: src/slic3r/GUI/ConfigManipulation.cpp:64 src/libslic3r/PrintConfig.cpp:1188
 msgid "First layer height"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:81
+#: src/slic3r/GUI/ConfigManipulation.cpp:84
 #, possible-c-format
 msgid ""
 "The Spiral Vase mode requires:\n"
@@ -380,15 +422,15 @@ msgid ""
 "- Detect thin walls disabled"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:89
+#: src/slic3r/GUI/ConfigManipulation.cpp:92
 msgid "Shall I adjust those settings in order to enable Spiral Vase?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:90
+#: src/slic3r/GUI/ConfigManipulation.cpp:94
 msgid "Spiral Vase"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:115
+#: src/slic3r/GUI/ConfigManipulation.cpp:124
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only\n"
 "if they are printed with the current extruder without triggering a tool "
@@ -397,74 +439,73 @@ msgid ""
 "to be set to 0)."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:119
+#: src/slic3r/GUI/ConfigManipulation.cpp:128
 msgid "Shall I adjust those settings in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:120
-#: src/slic3r/GUI/ConfigManipulation.cpp:140
+#: src/slic3r/GUI/ConfigManipulation.cpp:130
+#: src/slic3r/GUI/ConfigManipulation.cpp:151
 msgid "Wipe Tower"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:136
+#: src/slic3r/GUI/ConfigManipulation.cpp:146
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers\n"
 "need to be synchronized with the object layers."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:139
+#: src/slic3r/GUI/ConfigManipulation.cpp:149
 msgid "Shall I synchronize support layers in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:159
+#: src/slic3r/GUI/ConfigManipulation.cpp:170
 msgid ""
 "Supports work better, if the following feature is enabled:\n"
 "- Detect bridging perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:162
+#: src/slic3r/GUI/ConfigManipulation.cpp:173
 msgid "Shall I adjust those settings for supports?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:163
+#: src/slic3r/GUI/ConfigManipulation.cpp:174
 msgid "Support Generator"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:198
+#: src/slic3r/GUI/ConfigManipulation.cpp:201
 msgid "The %1% infill pattern is not supposed to work at 100%% density."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:201
+#: src/slic3r/GUI/ConfigManipulation.cpp:204
 msgid "Shall I switch to rectilinear fill pattern?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:202
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/GUI_ObjectList.cpp:93
-#: src/slic3r/GUI/GUI_ObjectList.cpp:682 src/slic3r/GUI/Plater.cpp:389
-#: src/slic3r/GUI/Tab.cpp:1444 src/slic3r/GUI/Tab.cpp:1446
-#: src/libslic3r/PrintConfig.cpp:259 src/libslic3r/PrintConfig.cpp:497
-#: src/libslic3r/PrintConfig.cpp:521 src/libslic3r/PrintConfig.cpp:873
-#: src/libslic3r/PrintConfig.cpp:887 src/libslic3r/PrintConfig.cpp:924
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1175
-#: src/libslic3r/PrintConfig.cpp:1242 src/libslic3r/PrintConfig.cpp:1261
-#: src/libslic3r/PrintConfig.cpp:1280 src/libslic3r/PrintConfig.cpp:2017
-#: src/libslic3r/PrintConfig.cpp:2034
+#: src/slic3r/GUI/ConfigManipulation.cpp:206
+#: src/slic3r/GUI/GUI_Factories.cpp:55 src/slic3r/GUI/GUI_Factories.cpp:128
+#: src/slic3r/GUI/Plater.cpp:416 src/slic3r/GUI/Tab.cpp:1490
+#: src/slic3r/GUI/Tab.cpp:1492 src/libslic3r/PrintConfig.cpp:441
+#: src/libslic3r/PrintConfig.cpp:682 src/libslic3r/PrintConfig.cpp:706
+#: src/libslic3r/PrintConfig.cpp:1058 src/libslic3r/PrintConfig.cpp:1072
+#: src/libslic3r/PrintConfig.cpp:1109 src/libslic3r/PrintConfig.cpp:1345
+#: src/libslic3r/PrintConfig.cpp:1355 src/libslic3r/PrintConfig.cpp:1422
+#: src/libslic3r/PrintConfig.cpp:1441 src/libslic3r/PrintConfig.cpp:1460
+#: src/libslic3r/PrintConfig.cpp:2266 src/libslic3r/PrintConfig.cpp:2283
 msgid "Infill"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:322
+#: src/slic3r/GUI/ConfigManipulation.cpp:334
 msgid "Head penetration should not be greater than the head width."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:324
+#: src/slic3r/GUI/ConfigManipulation.cpp:337
 msgid "Invalid Head penetration"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:335
+#: src/slic3r/GUI/ConfigManipulation.cpp:348
 msgid "Pinhead diameter should be smaller than the pillar diameter."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigManipulation.cpp:337
+#: src/slic3r/GUI/ConfigManipulation.cpp:351
 msgid "Invalid pinhead diameter"
 msgstr ""
 
@@ -480,200 +521,221 @@ msgstr ""
 msgid "Before roll back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25 src/libslic3r/PrintConfig.cpp:143
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25 src/libslic3r/PrintConfig.cpp:307
 msgid "User"
 msgstr ""
 
 #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:28
-#: src/slic3r/GUI/GUI_Preview.cpp:226 src/libslic3r/ExtrusionEntity.cpp:309
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/ExtrusionEntity.cpp:311
 msgid "Unknown"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
 msgid "Active"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60
 msgid "PrusaSlicer version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55 src/libslic3r/Preset.cpp:1303
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:64 src/libslic3r/Preset.cpp:1313
 msgid "print"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:65
 msgid "filaments"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:59 src/libslic3r/Preset.cpp:1305
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68 src/libslic3r/Preset.cpp:1315
 msgid "SLA print"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:60 src/slic3r/GUI/Plater.cpp:693
-#: src/libslic3r/Preset.cpp:1306
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:749 src/slic3r/GUI/ConfigWizard.cpp:769
+#: src/slic3r/GUI/ConfigWizard.cpp:2673 src/slic3r/GUI/GUI.cpp:340
+#: src/slic3r/GUI/Plater.cpp:742 src/libslic3r/Preset.cpp:1316
 msgid "SLA material"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:62 src/libslic3r/Preset.cpp:1307
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71 src/libslic3r/Preset.cpp:1317
 msgid "printer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66 src/slic3r/GUI/Tab.cpp:1304
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75 src/slic3r/GUI/Tab.cpp:1353
 msgid "vendor"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:66
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:75
 msgid "version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:67
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:76
 msgid "min PrusaSlicer version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:78
 msgid "max PrusaSlicer version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:81
 msgid "model"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:81
 msgid "variants"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:84
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:93
 #, possible-c-format
 msgid "Incompatible with this %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:87
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:96
 msgid "Activate"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:113
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:123
 msgid "Configuration Snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:242
+#: src/slic3r/GUI/ConfigWizard.cpp:258
 msgid "nozzle"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:246
+#: src/slic3r/GUI/ConfigWizard.cpp:262
 msgid "Alternate nozzles:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:310
+#: src/slic3r/GUI/ConfigWizard.cpp:326
 msgid "All standard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:310
+#: src/slic3r/GUI/ConfigWizard.cpp:326
 msgid "Standard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:311 src/slic3r/GUI/ConfigWizard.cpp:605
-#: src/slic3r/GUI/Tab.cpp:3583 src/slic3r/GUI/UnsavedChangesDialog.cpp:933
+#: src/slic3r/GUI/ConfigWizard.cpp:327 src/slic3r/GUI/ConfigWizard.cpp:645
+#: src/slic3r/GUI/Tab.cpp:3742 src/slic3r/GUI/UnsavedChangesDialog.cpp:1157
 msgid "All"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:312 src/slic3r/GUI/ConfigWizard.cpp:606
-#: src/slic3r/GUI/DoubleSlider.cpp:1879 src/slic3r/GUI/Plater.cpp:361
-#: src/slic3r/GUI/Plater.cpp:504 src/libslic3r/PrintConfig.cpp:1045
+#: src/slic3r/GUI/ConfigWizard.cpp:328 src/slic3r/GUI/ConfigWizard.cpp:646
+#: src/slic3r/GUI/DoubleSlider.cpp:2010 src/slic3r/GUI/Plater.cpp:388
+#: src/slic3r/GUI/Plater.cpp:533 src/libslic3r/PrintConfig.cpp:1246
 msgid "None"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:452
+#: src/slic3r/GUI/ConfigWizard.cpp:480
 #, possible-c-format
 msgid "Welcome to the %s Configuration Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:454
+#: src/slic3r/GUI/ConfigWizard.cpp:482
 #, possible-c-format
 msgid "Welcome to the %s Configuration Wizard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:456
+#: src/slic3r/GUI/ConfigWizard.cpp:484
 msgid "Welcome"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:458
+#: src/slic3r/GUI/ConfigWizard.cpp:486
 #, possible-c-format
 msgid ""
 "Hello, welcome to %s! This %s helps you with the initial configuration; just "
 "a few settings and you will be ready to print."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:463
+#: src/slic3r/GUI/ConfigWizard.cpp:491
 msgid "Remove user profiles (a snapshot will be taken beforehand)"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:506
+#: src/slic3r/GUI/ConfigWizard.cpp:494
+msgid ""
+"Perform desktop integration (Sets this binary to be searchable by the "
+"system)."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:546
 #, possible-c-format
 msgid "%s Family"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:594
+#: src/slic3r/GUI/ConfigWizard.cpp:634
 msgid "Printer:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:596
+#: src/slic3r/GUI/ConfigWizard.cpp:636
 msgid "Vendor:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:597
+#: src/slic3r/GUI/ConfigWizard.cpp:637
 msgid "Profile:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:669 src/slic3r/GUI/ConfigWizard.cpp:819
-#: src/slic3r/GUI/ConfigWizard.cpp:880 src/slic3r/GUI/ConfigWizard.cpp:1017
+#: src/slic3r/GUI/ConfigWizard.cpp:714 src/slic3r/GUI/ConfigWizard.cpp:882
+#: src/slic3r/GUI/ConfigWizard.cpp:942 src/slic3r/GUI/ConfigWizard.cpp:1078
 msgid "(All)"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:698
+#: src/slic3r/GUI/ConfigWizard.cpp:746
 msgid ""
-"Filaments marked with <b>*</b> are <b>not</b> compatible with some installed "
+"%1% marked with <b>*</b> are <b>not</b> compatible with some installed "
 "printers."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:701
-msgid "All installed printers are compatible with the selected filament."
+#: src/slic3r/GUI/ConfigWizard.cpp:746 src/slic3r/GUI/ConfigWizard.cpp:2028
+#: src/slic3r/GUI/ConfigWizard.cpp:2681 src/slic3r/GUI/ConfigWizard.cpp:2853
+msgid "Filaments"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:721
+#: src/slic3r/GUI/ConfigWizard.cpp:746 src/slic3r/GUI/ConfigWizard.cpp:2681
+msgid "SLA materials"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:749
+msgid "All installed printers are compatible with the selected %1%."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:749 src/slic3r/GUI/ConfigWizard.cpp:769
+#: src/libslic3r/Preset.cpp:1314
+msgid "filament"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:769
 msgid ""
-"Only the following installed printers are compatible with the selected "
-"filament:"
+"Only the following installed printers are compatible with the selected %1%:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1105
+#: src/slic3r/GUI/ConfigWizard.cpp:1165
 msgid "Custom Printer Setup"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1105
+#: src/slic3r/GUI/ConfigWizard.cpp:1165
 msgid "Custom Printer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1107
+#: src/slic3r/GUI/ConfigWizard.cpp:1167
 msgid "Define a custom printer profile"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1109
+#: src/slic3r/GUI/ConfigWizard.cpp:1169
 msgid "Custom profile name:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1134
+#: src/slic3r/GUI/ConfigWizard.cpp:1196
 msgid "Automatic updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1134
+#: src/slic3r/GUI/ConfigWizard.cpp:1196
 msgid "Updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1142 src/slic3r/GUI/Preferences.cpp:94
+#: src/slic3r/GUI/ConfigWizard.cpp:1204 src/slic3r/GUI/Preferences.cpp:112
 msgid "Check for application updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1146
+#: src/slic3r/GUI/ConfigWizard.cpp:1208
 #, possible-c-format
 msgid ""
 "If enabled, %s checks for new application versions online. When a new "
@@ -682,11 +744,11 @@ msgid ""
 "notification mechanisms, no automatic installation is done."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1152 src/slic3r/GUI/Preferences.cpp:129
+#: src/slic3r/GUI/ConfigWizard.cpp:1214 src/slic3r/GUI/Preferences.cpp:145
 msgid "Update built-in Presets automatically"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1156
+#: src/slic3r/GUI/ConfigWizard.cpp:1218
 #, possible-c-format
 msgid ""
 "If enabled, %s downloads updates of built-in system presets in the "
@@ -695,30 +757,29 @@ msgid ""
 "startup."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1159
+#: src/slic3r/GUI/ConfigWizard.cpp:1221
 msgid ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1164
+#: src/slic3r/GUI/ConfigWizard.cpp:1226
 msgid ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1171 src/slic3r/GUI/GUI_ObjectList.cpp:1843
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4601 src/slic3r/GUI/Plater.cpp:3130
-#: src/slic3r/GUI/Plater.cpp:4022 src/slic3r/GUI/Plater.cpp:4053
+#: src/slic3r/GUI/ConfigWizard.cpp:1233 src/slic3r/GUI/GUI_Factories.cpp:720
+#: src/slic3r/GUI/Plater.cpp:3422
 msgid "Reload from disk"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1174
+#: src/slic3r/GUI/ConfigWizard.cpp:1236
 msgid ""
 "Export full pathnames of models and parts sources into 3mf and amf files"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1178
+#: src/slic3r/GUI/ConfigWizard.cpp:1240
 msgid ""
 "If enabled, allows the Reload from disk command to automatically find and "
 "load the files when invoked.\n"
@@ -726,23 +787,23 @@ msgid ""
 "using an open file dialog."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1188
+#: src/slic3r/GUI/ConfigWizard.cpp:1249
 msgid "Files association"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1190 src/slic3r/GUI/Preferences.cpp:112
+#: src/slic3r/GUI/ConfigWizard.cpp:1251 src/slic3r/GUI/Preferences.cpp:129
 msgid "Associate .3mf files to PrusaSlicer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1191 src/slic3r/GUI/Preferences.cpp:119
+#: src/slic3r/GUI/ConfigWizard.cpp:1252 src/slic3r/GUI/Preferences.cpp:136
 msgid "Associate .stl files to PrusaSlicer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1202
+#: src/slic3r/GUI/ConfigWizard.cpp:1262
 msgid "View mode"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1204
+#: src/slic3r/GUI/ConfigWizard.cpp:1264
 msgid ""
 "PrusaSlicer's user interfaces comes in three variants:\n"
 "Simple, Advanced, and Expert.\n"
@@ -751,241 +812,338 @@ msgid ""
 "fine-tuning, they are suitable for advanced and expert users, respectively."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1209
+#: src/slic3r/GUI/ConfigWizard.cpp:1269
 msgid "Simple mode"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1210
+#: src/slic3r/GUI/ConfigWizard.cpp:1270
 msgid "Advanced mode"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1211
+#: src/slic3r/GUI/ConfigWizard.cpp:1271
 msgid "Expert mode"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1217
+#: src/slic3r/GUI/ConfigWizard.cpp:1277
 msgid "The size of the object can be specified in inches"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1218
+#: src/slic3r/GUI/ConfigWizard.cpp:1278
 msgid "Use inches"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1252
+#: src/slic3r/GUI/ConfigWizard.cpp:1312
 msgid "Other Vendors"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1256
+#: src/slic3r/GUI/ConfigWizard.cpp:1316
 #, possible-c-format
 msgid "Pick another vendor supported by %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1287
+#: src/slic3r/GUI/ConfigWizard.cpp:1347
 msgid "Firmware Type"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1287 src/slic3r/GUI/Tab.cpp:2186
+#: src/slic3r/GUI/ConfigWizard.cpp:1347 src/slic3r/GUI/Tab.cpp:2290
 msgid "Firmware"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1291
+#: src/slic3r/GUI/ConfigWizard.cpp:1351
 msgid "Choose the type of firmware used by your printer."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1325
+#: src/slic3r/GUI/ConfigWizard.cpp:1386
 msgid "Bed Shape and Size"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1328
+#: src/slic3r/GUI/ConfigWizard.cpp:1389
 msgid "Set the shape of your printer's bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1348
+#: src/slic3r/GUI/ConfigWizard.cpp:1423 src/slic3r/GUI/Field.cpp:255
+#: src/slic3r/GUI/Field.cpp:314 src/slic3r/GUI/Field.cpp:1554
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:429
+msgid "Invalid numeric input."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1447
 msgid "Filament and Nozzle Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1348
+#: src/slic3r/GUI/ConfigWizard.cpp:1447
 msgid "Print Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1362
+#: src/slic3r/GUI/ConfigWizard.cpp:1462
 msgid "Enter the diameter of your printer's hot end nozzle."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1365
+#: src/slic3r/GUI/ConfigWizard.cpp:1465
 msgid "Nozzle Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1375
+#: src/slic3r/GUI/ConfigWizard.cpp:1475
 msgid "Enter the diameter of your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1376
+#: src/slic3r/GUI/ConfigWizard.cpp:1476
 msgid ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1379
+#: src/slic3r/GUI/ConfigWizard.cpp:1479
 msgid "Filament Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1413
+#: src/slic3r/GUI/ConfigWizard.cpp:1537
 msgid "Nozzle and Bed Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1413
+#: src/slic3r/GUI/ConfigWizard.cpp:1537
 msgid "Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1429
+#: src/slic3r/GUI/ConfigWizard.cpp:1553
 msgid "Enter the temperature needed for extruding your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1430
+#: src/slic3r/GUI/ConfigWizard.cpp:1554
 msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1433
+#: src/slic3r/GUI/ConfigWizard.cpp:1557
 msgid "Extrusion Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1434 src/slic3r/GUI/ConfigWizard.cpp:1448
-#: src/libslic3r/PrintConfig.cpp:202 src/libslic3r/PrintConfig.cpp:975
-#: src/libslic3r/PrintConfig.cpp:1019 src/libslic3r/PrintConfig.cpp:2383
+#: src/slic3r/GUI/ConfigWizard.cpp:1558 src/slic3r/GUI/ConfigWizard.cpp:1572
+#: src/libslic3r/PrintConfig.cpp:384 src/libslic3r/PrintConfig.cpp:1169
+#: src/libslic3r/PrintConfig.cpp:1221 src/libslic3r/PrintConfig.cpp:2739
 msgid "°C"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1443
+#: src/slic3r/GUI/ConfigWizard.cpp:1567
 msgid ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1444
+#: src/slic3r/GUI/ConfigWizard.cpp:1568
 msgid ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1447
+#: src/slic3r/GUI/ConfigWizard.cpp:1571
 msgid "Bed Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1907 src/slic3r/GUI/ConfigWizard.cpp:2580
-msgid "Filaments"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:1907 src/slic3r/GUI/ConfigWizard.cpp:2582
+#: src/slic3r/GUI/ConfigWizard.cpp:2028 src/slic3r/GUI/ConfigWizard.cpp:2855
 msgid "SLA Materials"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1961
+#: src/slic3r/GUI/ConfigWizard.cpp:2082
 msgid "FFF Technology Printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:1966
+#: src/slic3r/GUI/ConfigWizard.cpp:2087
 msgid "SLA Technology Printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2272 src/slic3r/GUI/DoubleSlider.cpp:2265
-#: src/slic3r/GUI/DoubleSlider.cpp:2285 src/slic3r/GUI/GUI.cpp:250
+#: src/slic3r/GUI/ConfigWizard.cpp:2395 src/slic3r/GUI/DoubleSlider.cpp:2487
+#: src/slic3r/GUI/DoubleSlider.cpp:2508 src/slic3r/GUI/GUI.cpp:232
 msgid "Notice"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2293
+#: src/slic3r/GUI/ConfigWizard.cpp:2416
 msgid "The following FFF printer models have no filament selected:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2297
+#: src/slic3r/GUI/ConfigWizard.cpp:2420
 msgid "Do you want to select default filaments for these FFF printer models?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2311
+#: src/slic3r/GUI/ConfigWizard.cpp:2434
 msgid "The following SLA printer models have no materials selected:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2315
+#: src/slic3r/GUI/ConfigWizard.cpp:2438
 msgid "Do you want to select default SLA materials for these printer models?"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2543
+#: src/slic3r/GUI/ConfigWizard.cpp:2480 src/slic3r/GUI/GUI_App.cpp:2471
+msgid "Configuration is editing from ConfigWizard"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2523
+msgid "All user presets will be deleted."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2553
+msgid "New vendor was installed and one of its printer will be activated"
+msgid_plural ""
+"New vendors were installed and one of theirs printer will be activated"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2582
+msgid "Continue with applying configuration changes?"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2648
+msgid "A new Printer was installed and it will be activated."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2653
+msgid "Some Printers were uninstalled."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2673
+msgid "A new %1% was installed and it will be activated."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2673 src/slic3r/GUI/GCodeViewer.cpp:3972
+#: src/slic3r/GUI/GCodeViewer.cpp:3998 src/slic3r/GUI/GUI.cpp:339
+#: src/slic3r/GUI/Plater.cpp:740 src/slic3r/GUI/Tab.cpp:1894
+#: src/slic3r/GUI/Tab.cpp:1895
+msgid "Filament"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2681
+msgid "Some %1% were uninstalled."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2725
+msgid "Custom printer was installed and it will be activated."
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:2810
 msgid "Select all standard printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2546
+#: src/slic3r/GUI/ConfigWizard.cpp:2813
 msgid "< &Back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2547
+#: src/slic3r/GUI/ConfigWizard.cpp:2814
 msgid "&Next >"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2548
+#: src/slic3r/GUI/ConfigWizard.cpp:2815
 msgid "&Finish"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2549 src/slic3r/GUI/FirmwareDialog.cpp:151
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:248
+#: src/slic3r/GUI/ConfigWizard.cpp:2816
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:490
+#: src/slic3r/GUI/FirmwareDialog.cpp:153
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:56
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:215
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:243
 #: src/slic3r/GUI/ProgressStatusBar.cpp:26
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:656
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:82
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:878
 msgid "Cancel"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2562
+#: src/slic3r/GUI/ConfigWizard.cpp:2835
 msgid "Prusa FFF Technology Printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2565
+#: src/slic3r/GUI/ConfigWizard.cpp:2838
 msgid "Prusa MSLA Technology Printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2580
+#: src/slic3r/GUI/ConfigWizard.cpp:2853
 msgid "Filament Profiles Selection"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2580 src/slic3r/GUI/ConfigWizard.cpp:2582
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4178
+#: src/slic3r/GUI/ConfigWizard.cpp:2853 src/slic3r/GUI/ConfigWizard.cpp:2855
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3771
 msgid "Type:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2582
+#: src/slic3r/GUI/ConfigWizard.cpp:2855
 msgid "SLA Material Profiles Selection"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2699
+#: src/slic3r/GUI/ConfigWizard.cpp:2976
 msgid "Configuration Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2700
+#: src/slic3r/GUI/ConfigWizard.cpp:2977
 msgid "Configuration &Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2702
+#: src/slic3r/GUI/ConfigWizard.cpp:2979
 msgid "Configuration Wizard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:2703
+#: src/slic3r/GUI/ConfigWizard.cpp:2980
 msgid "Configuration &Wizard"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:97
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:232
+msgid ""
+"Performing desktop integration failed - boost::filesystem::canonical did not "
+"return appimage path."
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:243
+msgid "Performing desktop integration failed - Could not find executable."
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:378
+msgid ""
+"Performing desktop integration failed - could not find applications "
+"directory."
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:419
+msgid ""
+"Performing desktop integration failed - could not create Gcodeviewer desktop "
+"file. PrusaSlicer desktop file was probably created successfully."
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:459
+#: src/slic3r/GUI/GUI_App.cpp:1825
+msgid "Desktop Integration"
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:466
+msgid ""
+"Desktop Integration sets this binary to be searchable by the system.\n"
+"\n"
+"Press \"Perform\" to proceed."
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:480
+msgid "Perform"
+msgstr ""
+
+#: src/slic3r/GUI/DesktopIntegrationDialog.cpp:486
+#: src/slic3r/GUI/GLCanvas3D.cpp:4675 src/slic3r/GUI/KBShortcutsDialog.cpp:97
+#: src/slic3r/GUI/MainFrame.cpp:1341
+msgid "Undo"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:101
 msgid "Place bearings in slots and resume printing"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1244
+#: src/slic3r/GUI/DoubleSlider.cpp:1371
 msgid "One layer mode"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1246
+#: src/slic3r/GUI/DoubleSlider.cpp:1373
 msgid "Discard all custom changes"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1250 src/slic3r/GUI/DoubleSlider.cpp:2015
+#: src/slic3r/GUI/DoubleSlider.cpp:1377 src/slic3r/GUI/DoubleSlider.cpp:2220
 msgid "Jump to move"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1253
+#: src/slic3r/GUI/DoubleSlider.cpp:1380
 #, possible-c-format
 msgid ""
 "Jump to height %s\n"
@@ -993,48 +1151,59 @@ msgid ""
 "or Set extruder sequence for the entire print"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1256
+#: src/slic3r/GUI/DoubleSlider.cpp:1383
 #, possible-c-format
 msgid ""
 "Jump to height %s\n"
 "or Set ruler mode"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1261
+#: src/slic3r/GUI/DoubleSlider.cpp:1388
 msgid "Edit current color - Right click the colored slider segment"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1271
+#: src/slic3r/GUI/DoubleSlider.cpp:1390
+msgid "This is wipe tower layer"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1400
+msgid ""
+"The sequential print is on.\n"
+"It's impossible to apply any custom G-code for objects printing "
+"sequentually.\n"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:1404
 msgid "Print mode"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1285
+#: src/slic3r/GUI/DoubleSlider.cpp:1418
 msgid "Add extruder change - Left click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1287
+#: src/slic3r/GUI/DoubleSlider.cpp:1420
 msgid ""
 "Add color change - Left click for predefined color or Shift + Left click for "
 "custom color selection"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1289
+#: src/slic3r/GUI/DoubleSlider.cpp:1422
 msgid "Add color change - Left click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1290
+#: src/slic3r/GUI/DoubleSlider.cpp:1423
 msgid "or press \"+\" key"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1292
+#: src/slic3r/GUI/DoubleSlider.cpp:1425
 msgid "Add another code - Ctrl + Left click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1293
+#: src/slic3r/GUI/DoubleSlider.cpp:1426
 msgid "Add another code - Right click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1299
+#: src/slic3r/GUI/DoubleSlider.cpp:1432
 msgid ""
 "The sequential print is on.\n"
 "It's impossible to apply any custom G-code for objects printing "
@@ -1042,326 +1211,351 @@ msgid ""
 "This code won't be processed during G-code generation."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1308
+#: src/slic3r/GUI/DoubleSlider.cpp:1446
 msgid "Color change (\"%1%\")"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1309
+#: src/slic3r/GUI/DoubleSlider.cpp:1447
 msgid "Color change (\"%1%\") for Extruder %2%"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1311
+#: src/slic3r/GUI/DoubleSlider.cpp:1449
 msgid "Pause print (\"%1%\")"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1313
+#: src/slic3r/GUI/DoubleSlider.cpp:1451
 msgid "Custom template (\"%1%\")"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1315
+#: src/slic3r/GUI/DoubleSlider.cpp:1453
 msgid "Extruder (tool) is changed to Extruder \"%1%\""
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1322
+#: src/slic3r/GUI/DoubleSlider.cpp:1460
 msgid "Note"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1324
+#: src/slic3r/GUI/DoubleSlider.cpp:1462
 msgid ""
 "G-code associated to this tick mark is in a conflict with print mode.\n"
 "Editing it will cause changes of Slider data."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1327
+#: src/slic3r/GUI/DoubleSlider.cpp:1465
 msgid ""
 "There is a color change for extruder that won't be used till the end of "
 "print job.\n"
 "This code won't be processed during G-code generation."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1330
+#: src/slic3r/GUI/DoubleSlider.cpp:1468
 msgid ""
 "There is an extruder change set to the same extruder.\n"
 "This code won't be processed during G-code generation."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1333
+#: src/slic3r/GUI/DoubleSlider.cpp:1471
 msgid ""
 "There is a color change for extruder that has not been used before.\n"
 "Check your settings to avoid redundant color changes."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1338
+#: src/slic3r/GUI/DoubleSlider.cpp:1476
 msgid "Delete tick mark - Left click or press \"-\" key"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1340
+#: src/slic3r/GUI/DoubleSlider.cpp:1478
 msgid "Edit tick mark - Ctrl + Left click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1341
+#: src/slic3r/GUI/DoubleSlider.cpp:1479
 msgid "Edit tick mark - Right click"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1437 src/slic3r/GUI/DoubleSlider.cpp:1471
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1882
+#: src/slic3r/GUI/DoubleSlider.cpp:1582 src/slic3r/GUI/DoubleSlider.cpp:1613
+#: src/slic3r/GUI/GUI_Factories.cpp:772
 #, possible-c-format
 msgid "Extruder %d"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1438 src/slic3r/GUI/GUI_ObjectList.cpp:1883
+#: src/slic3r/GUI/DoubleSlider.cpp:1583 src/slic3r/GUI/GUI_Factories.cpp:773
 msgid "active"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1447
+#: src/slic3r/GUI/DoubleSlider.cpp:1592
 msgid "Switch code to Change extruder"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1447 src/slic3r/GUI/GUI_ObjectList.cpp:1850
+#: src/slic3r/GUI/DoubleSlider.cpp:1592 src/slic3r/GUI/GUI_Factories.cpp:734
 msgid "Change extruder"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1448
+#: src/slic3r/GUI/DoubleSlider.cpp:1593
 msgid "Change extruder (N/A)"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1450
+#: src/slic3r/GUI/DoubleSlider.cpp:1595 src/slic3r/GUI/GUI_Factories.cpp:781
 msgid "Use another extruder"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1472
+#: src/slic3r/GUI/DoubleSlider.cpp:1614
 msgid "used"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1480
+#: src/slic3r/GUI/DoubleSlider.cpp:1622
 msgid "Switch code to Color change (%1%) for:"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1481
+#: src/slic3r/GUI/DoubleSlider.cpp:1623
 msgid "Add color change (%1%) for:"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1817
+#: src/slic3r/GUI/DoubleSlider.cpp:1948
 msgid "Add color change"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1828
+#: src/slic3r/GUI/DoubleSlider.cpp:1959
 msgid "Add pause print"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1832
+#: src/slic3r/GUI/DoubleSlider.cpp:1963
 msgid "Add custom template"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1835
+#: src/slic3r/GUI/DoubleSlider.cpp:1966
 msgid "Add custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1853
+#: src/slic3r/GUI/DoubleSlider.cpp:1984
 msgid "Edit color"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1854
+#: src/slic3r/GUI/DoubleSlider.cpp:1985
 msgid "Edit pause print message"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1855
+#: src/slic3r/GUI/DoubleSlider.cpp:1986
 msgid "Edit custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1861
+#: src/slic3r/GUI/DoubleSlider.cpp:1992
 msgid "Delete color change"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1862
+#: src/slic3r/GUI/DoubleSlider.cpp:1993
 msgid "Delete tool change"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1863
+#: src/slic3r/GUI/DoubleSlider.cpp:1994
 msgid "Delete pause print"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1864
+#: src/slic3r/GUI/DoubleSlider.cpp:1995
 msgid "Delete custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1874 src/slic3r/GUI/DoubleSlider.cpp:2015
+#: src/slic3r/GUI/DoubleSlider.cpp:2005 src/slic3r/GUI/DoubleSlider.cpp:2220
 msgid "Jump to height"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1879
+#: src/slic3r/GUI/DoubleSlider.cpp:2010
 msgid "Hide ruler"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1883
+#: src/slic3r/GUI/DoubleSlider.cpp:2014
 msgid "Show object height"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1883
+#: src/slic3r/GUI/DoubleSlider.cpp:2014
 msgid "Show object height on the ruler"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1887
+#: src/slic3r/GUI/DoubleSlider.cpp:2018
 msgid "Show estimated print time"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1887
+#: src/slic3r/GUI/DoubleSlider.cpp:2018
 msgid "Show estimated print time on the ruler"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1891
+#: src/slic3r/GUI/DoubleSlider.cpp:2022
 msgid "Ruler mode"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1891
+#: src/slic3r/GUI/DoubleSlider.cpp:2022
 msgid "Set ruler mode"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1896
+#: src/slic3r/GUI/DoubleSlider.cpp:2027
 msgid "Set extruder sequence for the entire print"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1982
+#: src/slic3r/GUI/DoubleSlider.cpp:2031
+msgid "Set auto color changes"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:2040
+msgid "This action will cause deletion of all ticks on vertical slider."
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:2041 src/slic3r/GUI/Tab.cpp:1305
+msgid ""
+"This action is not revertible.\n"
+"Do you want to proceed?"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:2042
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1124 src/slic3r/GUI/GUI.cpp:245
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:640
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:670
+#: src/slic3r/GUI/WipeTowerDialog.cpp:58 src/slic3r/GUI/WipeTowerDialog.cpp:443
+msgid "Warning"
+msgstr ""
+
+#: src/slic3r/GUI/DoubleSlider.cpp:2181
 msgid "Enter custom G-code used on current layer"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1983
+#: src/slic3r/GUI/DoubleSlider.cpp:2182
 msgid "Custom G-code on current layer (%1% mm)."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1998
+#: src/slic3r/GUI/DoubleSlider.cpp:2203
 msgid "Enter short message shown on Printer display when a print is paused"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:1999
+#: src/slic3r/GUI/DoubleSlider.cpp:2204
 msgid "Message for pause print on current layer (%1% mm)."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2014
+#: src/slic3r/GUI/DoubleSlider.cpp:2219
 msgid "Enter the move you want to jump to"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2014
+#: src/slic3r/GUI/DoubleSlider.cpp:2219
 msgid "Enter the height you want to jump to"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2259
+#: src/slic3r/GUI/DoubleSlider.cpp:2480
 msgid "The last color change data was saved for a single extruder printing."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2260 src/slic3r/GUI/DoubleSlider.cpp:2275
+#: src/slic3r/GUI/DoubleSlider.cpp:2481 src/slic3r/GUI/DoubleSlider.cpp:2497
 msgid "The last color change data was saved for a multi extruder printing."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2262
+#: src/slic3r/GUI/DoubleSlider.cpp:2483
 msgid "Your current changes will delete all saved color changes."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2263 src/slic3r/GUI/DoubleSlider.cpp:2283
+#: src/slic3r/GUI/DoubleSlider.cpp:2484 src/slic3r/GUI/DoubleSlider.cpp:2505
 msgid "Are you sure you want to continue?"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2276
+#: src/slic3r/GUI/DoubleSlider.cpp:2498
 msgid ""
 "Select YES if you want to delete all saved tool changes, \n"
 "NO if you want all tool changes switch to color changes, \n"
 "or CANCEL to leave it unchanged."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2279
+#: src/slic3r/GUI/DoubleSlider.cpp:2501
 msgid "Do you want to delete all saved tool changes?"
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2281
+#: src/slic3r/GUI/DoubleSlider.cpp:2503
 msgid ""
 "The last color change data was saved for a multi extruder printing with tool "
 "changes for whole print."
 msgstr ""
 
-#: src/slic3r/GUI/DoubleSlider.cpp:2282
+#: src/slic3r/GUI/DoubleSlider.cpp:2504
 msgid "Your current changes will delete all saved extruder (tool) changes."
 msgstr ""
 
-#: src/slic3r/GUI/ExtraRenderers.cpp:296 src/slic3r/GUI/GUI_ObjectList.cpp:526
-#: src/slic3r/GUI/GUI_ObjectList.cpp:538 src/slic3r/GUI/GUI_ObjectList.cpp:1047
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4616
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4626
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4661
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:209
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:266
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:291
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:499 src/libslic3r/PrintConfig.cpp:577
+#: src/slic3r/GUI/ExtraRenderers.cpp:320 src/slic3r/GUI/GUI_ObjectList.cpp:520
+#: src/slic3r/GUI/GUI_ObjectList.cpp:532 src/slic3r/GUI/GUI_ObjectList.cpp:968
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1952
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4294
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:250
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:352
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:376
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:607 src/libslic3r/PrintConfig.cpp:762
 msgid "default"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:24
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:26
 msgid "Set extruder sequence"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:40
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:46
 msgid "Set extruder change for every"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:53
-#: src/libslic3r/PrintConfig.cpp:443 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1807 src/libslic3r/PrintConfig.cpp:1972
-#: src/libslic3r/PrintConfig.cpp:2039 src/libslic3r/PrintConfig.cpp:2246
-#: src/libslic3r/PrintConfig.cpp:2292
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:60
+#: src/libslic3r/PrintConfig.cpp:628 src/libslic3r/PrintConfig.cpp:1358
+#: src/libslic3r/PrintConfig.cpp:2049 src/libslic3r/PrintConfig.cpp:2212
+#: src/libslic3r/PrintConfig.cpp:2288 src/libslic3r/PrintConfig.cpp:2538
+#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2604
 msgid "layers"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:137
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:166
+msgid "If enabled, random sequence of the selected extruders will be used."
+msgstr ""
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:174
+msgid "If enabled, a repetition of the next random color will be allowed."
+msgstr ""
+
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:177
 msgid "Set extruder(tool) sequence"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:183
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:229
 msgid "Remove extruder from sequence"
 msgstr ""
 
-#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:193
+#: src/slic3r/GUI/ExtruderSequenceDialog.cpp:239
 msgid "Add extruder to sequence"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:197
+#: src/slic3r/GUI/Field.cpp:190
 msgid "default value"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:200
+#: src/slic3r/GUI/Field.cpp:193
 msgid "parameter name"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:211 src/slic3r/GUI/OptionsGroup.cpp:780
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:886
+#: src/slic3r/GUI/Field.cpp:204 src/slic3r/GUI/OptionsGroup.cpp:807
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1070
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1082
 msgid "N/A"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:233
+#: src/slic3r/GUI/Field.cpp:226
 #, possible-c-format
 msgid "%s doesn't support percentage"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:253 src/slic3r/GUI/Field.cpp:307
-#: src/slic3r/GUI/Field.cpp:1507 src/slic3r/GUI/GUI_ObjectLayers.cpp:413
-msgid "Invalid numeric input."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:264
+#: src/slic3r/GUI/Field.cpp:266
 #, possible-c-format
 msgid ""
 "Input value is out of range\n"
 "Are you sure that %s is a correct value and that you want to continue?"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:266 src/slic3r/GUI/Field.cpp:326
+#: src/slic3r/GUI/Field.cpp:269 src/slic3r/GUI/Field.cpp:334
 msgid "Parameter validation"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:279 src/slic3r/GUI/Field.cpp:373
-#: src/slic3r/GUI/Field.cpp:1519
+#: src/slic3r/GUI/Field.cpp:282 src/slic3r/GUI/Field.cpp:381
+#: src/slic3r/GUI/Field.cpp:1566
 msgid "Input value is out of range"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:323
+#: src/slic3r/GUI/Field.cpp:330
 #, possible-c-format
 msgid ""
 "Do you mean %s%% instead of %s %s?\n"
@@ -1369,37 +1563,37 @@ msgid ""
 "or NO if you are sure that %s %s is a correct value."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:381
+#: src/slic3r/GUI/Field.cpp:388
 msgid ""
 "Invalid input format. Expected vector of dimensions in the following format: "
 "\"%1%\""
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:150
+#: src/slic3r/GUI/FirmwareDialog.cpp:152
 msgid "Flash!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:152
+#: src/slic3r/GUI/FirmwareDialog.cpp:154
 msgid "Flashing in progress. Please do not disconnect the printer!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:199
+#: src/slic3r/GUI/FirmwareDialog.cpp:201
 msgid "Flashing failed"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:282
+#: src/slic3r/GUI/FirmwareDialog.cpp:284
 msgid "Flashing succeeded!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:283
+#: src/slic3r/GUI/FirmwareDialog.cpp:285
 msgid "Flashing failed. Please see the avrdude log below."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:284
+#: src/slic3r/GUI/FirmwareDialog.cpp:286
 msgid "Flashing cancelled."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:332
+#: src/slic3r/GUI/FirmwareDialog.cpp:334
 #, possible-c-format
 msgid ""
 "This firmware hex file does not match the printer model.\n"
@@ -1410,13 +1604,13 @@ msgid ""
 "Please only continue if you are sure this is the right thing to do."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:419 src/slic3r/GUI/FirmwareDialog.cpp:454
+#: src/slic3r/GUI/FirmwareDialog.cpp:421 src/slic3r/GUI/FirmwareDialog.cpp:456
 #, possible-c-format
 msgid ""
 "Multiple %s devices found. Please only connect one at a time for flashing."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:436
+#: src/slic3r/GUI/FirmwareDialog.cpp:438
 #, possible-c-format
 msgid ""
 "The %s device was not found.\n"
@@ -1424,1065 +1618,1339 @@ msgid ""
 "connector ..."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:548
+#: src/slic3r/GUI/FirmwareDialog.cpp:550
 #, possible-c-format
 msgid "The %s device could not have been found"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:645
+#: src/slic3r/GUI/FirmwareDialog.cpp:651
 #, possible-c-format
 msgid "Error accessing port at %s: %s"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:647
+#: src/slic3r/GUI/FirmwareDialog.cpp:653
 #, possible-c-format
 msgid "Error: %s"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:777
+#: src/slic3r/GUI/FirmwareDialog.cpp:788
 msgid "Firmware flasher"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:802
+#: src/slic3r/GUI/FirmwareDialog.cpp:813
 msgid "Firmware image:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:805
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:289
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364
+#: src/slic3r/GUI/FirmwareDialog.cpp:816
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:297
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:372
 msgid "Browse"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:807
+#: src/slic3r/GUI/FirmwareDialog.cpp:818
 msgid "Serial port:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
+#: src/slic3r/GUI/FirmwareDialog.cpp:820
 msgid "Autodetected"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
+#: src/slic3r/GUI/FirmwareDialog.cpp:821
 msgid "Rescan"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:817
+#: src/slic3r/GUI/FirmwareDialog.cpp:828
 msgid "Progress:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:820
+#: src/slic3r/GUI/FirmwareDialog.cpp:831
 msgid "Status:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:821
+#: src/slic3r/GUI/FirmwareDialog.cpp:832
 msgid "Ready"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:841
+#: src/slic3r/GUI/FirmwareDialog.cpp:852
 msgid "Advanced: Output log"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:852
-#: src/slic3r/GUI/Mouse3DController.cpp:551
-#: src/slic3r/GUI/PrintHostDialogs.cpp:200
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
+#: src/slic3r/GUI/Mouse3DController.cpp:543
+#: src/slic3r/GUI/PrintHostDialogs.cpp:244
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:111
 msgid "Close"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:902
+#: src/slic3r/GUI/FirmwareDialog.cpp:916
 msgid ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:903
+#: src/slic3r/GUI/FirmwareDialog.cpp:917
 msgid "Confirmation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:906
+#: src/slic3r/GUI/FirmwareDialog.cpp:920
 msgid "Cancelling..."
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:289
+#: src/slic3r/GUI/GalleryDialog.cpp:69
+msgid "Shapes Gallery"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:76
+msgid "Select shape from the gallery"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:98
+msgid "Add to bed"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:99
+msgid "Add selected shape(s) to the bed"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:123
+msgid "Add"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:123
+msgid "Add one or more custom shapes"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:124 src/slic3r/GUI/GLCanvas3D.cpp:4466
+#: src/slic3r/GUI/GUI_Factories.cpp:444 src/slic3r/GUI/Tab.cpp:3660
+msgid "Delete"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:124
+msgid "Delete one or more custom shape. You can't delete system shapes"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:125
+msgid "Replace PNG"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:125
+msgid "Replace PNG for custom shape. You can't raplace PNG for system shape"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:395
+msgid "Choose one or more files (STL, OBJ):"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:435
+msgid ""
+"It looks like selected %1%-file has an error or is destructed.\n"
+"We can't load this file"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:446
+msgid "Choose one PNG file:"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:459
+msgid "Replacing of the PNG"
+msgstr ""
+
+#: src/slic3r/GUI/GalleryDialog.cpp:524 src/slic3r/GUI/GalleryDialog.cpp:529
+msgid "Loading of the \"%1%\""
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:267
 msgid "Tool position"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:1418 src/slic3r/GUI/GCodeViewer.cpp:1918
+#: src/slic3r/GUI/GCodeViewer.cpp:1539
 msgid "Generating toolpaths"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:1456 src/slic3r/GUI/GCodeViewer.cpp:2302
+#: src/slic3r/GUI/GCodeViewer.cpp:1610
 msgid "Generating vertex buffer"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:1719 src/slic3r/GUI/GCodeViewer.cpp:2390
+#: src/slic3r/GUI/GCodeViewer.cpp:2028
 msgid "Generating index buffers"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3535
+#: src/slic3r/GUI/GCodeViewer.cpp:3318
 msgid "Click to hide"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3535
+#: src/slic3r/GUI/GCodeViewer.cpp:3318
 msgid "Click to show"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3647
+#: src/slic3r/GUI/GCodeViewer.cpp:3448
 msgid "up to"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3653
+#: src/slic3r/GUI/GCodeViewer.cpp:3454
 msgid "above"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3661
+#: src/slic3r/GUI/GCodeViewer.cpp:3462
 msgid "from"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3661
+#: src/slic3r/GUI/GCodeViewer.cpp:3462
 msgid "to"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3689 src/slic3r/GUI/GCodeViewer.cpp:3697
-#: src/slic3r/GUI/GUI_Preview.cpp:211 src/slic3r/GUI/GUI_Preview.cpp:536
-#: src/slic3r/GUI/GUI_Preview.cpp:945
-msgid "Feature type"
-msgstr ""
-
-#: src/slic3r/GUI/GCodeViewer.cpp:3689 src/slic3r/GUI/GCodeViewer.cpp:3697
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr ""
-
-#: src/slic3r/GUI/GCodeViewer.cpp:3697
+#: src/slic3r/GUI/GCodeViewer.cpp:3512 src/slic3r/GUI/GCodeViewer.cpp:3513
+#: src/slic3r/GUI/GCodeViewer.cpp:3562
 msgid "Percentage"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3700
+#: src/slic3r/GUI/GCodeViewer.cpp:3523 src/slic3r/GUI/GCodeViewer.cpp:3562
+#: src/slic3r/GUI/GUI_Preview.cpp:216 src/slic3r/GUI/GUI_Preview.cpp:958
+msgid "Feature type"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:3523 src/slic3r/GUI/GCodeViewer.cpp:3562
+#: src/slic3r/GUI/RammingChart.cpp:90
+msgid "Time"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:3562 src/slic3r/GUI/GCodeViewer.cpp:3573
+#: src/slic3r/GUI/GCodeViewer.cpp:3834
+msgid "Used filament"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:3565
 msgid "Height (mm)"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3701
+#: src/slic3r/GUI/GCodeViewer.cpp:3566
 msgid "Width (mm)"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3702
+#: src/slic3r/GUI/GCodeViewer.cpp:3567
 msgid "Speed (mm/s)"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3703
+#: src/slic3r/GUI/GCodeViewer.cpp:3568
 msgid "Fan Speed (%)"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3704
+#: src/slic3r/GUI/GCodeViewer.cpp:3569
+msgid "Temperature (°C)"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:3570
 msgid "Volumetric flow rate (mm³/s)"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3705 src/slic3r/GUI/GUI_Preview.cpp:217
-#: src/slic3r/GUI/GUI_Preview.cpp:323 src/slic3r/GUI/GUI_Preview.cpp:474
-#: src/slic3r/GUI/GUI_Preview.cpp:535 src/slic3r/GUI/GUI_Preview.cpp:881
-#: src/slic3r/GUI/GUI_Preview.cpp:945
+#: src/slic3r/GUI/GCodeViewer.cpp:3573 src/slic3r/GUI/GUI_Preview.cpp:223
+#: src/slic3r/GUI/GUI_Preview.cpp:958
 msgid "Tool"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3706 src/slic3r/GUI/GUI_Preview.cpp:218
-#: src/slic3r/GUI/GUI_Preview.cpp:533 src/slic3r/GUI/GUI_Preview.cpp:944
+#: src/slic3r/GUI/GCodeViewer.cpp:3576 src/slic3r/GUI/GUI_Preview.cpp:224
+#: src/slic3r/GUI/GUI_Preview.cpp:957
 msgid "Color Print"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3742 src/slic3r/GUI/GCodeViewer.cpp:3777
-#: src/slic3r/GUI/GCodeViewer.cpp:3782 src/slic3r/GUI/GUI_ObjectList.cpp:326
-#: src/slic3r/GUI/wxExtensions.cpp:519 src/libslic3r/PrintConfig.cpp:572
+#: src/slic3r/GUI/GCodeViewer.cpp:3614 src/slic3r/GUI/GCodeViewer.cpp:3660
+#: src/slic3r/GUI/GCodeViewer.cpp:3665 src/slic3r/GUI/GUI_ObjectList.cpp:312
+#: src/slic3r/GUI/wxExtensions.cpp:535 src/libslic3r/PrintConfig.cpp:757
 msgid "Extruder"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3753
+#: src/slic3r/GUI/GCodeViewer.cpp:3637
 msgid "Default color"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3777
+#: src/slic3r/GUI/GCodeViewer.cpp:3660
 msgid "default color"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3872 src/slic3r/GUI/GCodeViewer.cpp:3918
+#: src/slic3r/GUI/GCodeViewer.cpp:3759 src/slic3r/GUI/GCodeViewer.cpp:3815
 msgid "Color change"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3891 src/slic3r/GUI/GCodeViewer.cpp:3916
+#: src/slic3r/GUI/GCodeViewer.cpp:3778 src/slic3r/GUI/GCodeViewer.cpp:3813
 msgid "Print"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3917 src/slic3r/GUI/GCodeViewer.cpp:3934
+#: src/slic3r/GUI/GCodeViewer.cpp:3814 src/slic3r/GUI/GCodeViewer.cpp:3848
 msgid "Pause"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3922 src/slic3r/GUI/GCodeViewer.cpp:3925
+#: src/slic3r/GUI/GCodeViewer.cpp:3831 src/slic3r/GUI/GCodeViewer.cpp:3834
 msgid "Event"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3922 src/slic3r/GUI/GCodeViewer.cpp:3925
+#: src/slic3r/GUI/GCodeViewer.cpp:3831 src/slic3r/GUI/GCodeViewer.cpp:3834
 msgid "Remaining time"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3925
+#: src/slic3r/GUI/GCodeViewer.cpp:3831 src/slic3r/GUI/GCodeViewer.cpp:3834
 msgid "Duration"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3960 src/slic3r/GUI/GUI_Preview.cpp:1026
-#: src/libslic3r/PrintConfig.cpp:2469
+#: src/slic3r/GUI/GCodeViewer.cpp:3877 src/slic3r/GUI/GUI_Preview.cpp:1049
+#: src/libslic3r/PrintConfig.cpp:2832
 msgid "Travel"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3963
+#: src/slic3r/GUI/GCodeViewer.cpp:3880
 msgid "Movement"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3964
+#: src/slic3r/GUI/GCodeViewer.cpp:3881
 msgid "Extrusion"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3965 src/slic3r/GUI/Tab.cpp:1708
-#: src/slic3r/GUI/Tab.cpp:2596
+#: src/slic3r/GUI/GCodeViewer.cpp:3882 src/slic3r/GUI/Tab.cpp:1794
+#: src/slic3r/GUI/Tab.cpp:2733
 msgid "Retraction"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:3982 src/slic3r/GUI/GCodeViewer.cpp:3985
-#: src/slic3r/GUI/GUI_Preview.cpp:1027
+#: src/slic3r/GUI/GCodeViewer.cpp:3899 src/slic3r/GUI/GCodeViewer.cpp:3902
+#: src/slic3r/GUI/GUI_Preview.cpp:1050
 msgid "Wipe"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4016 src/slic3r/GUI/GUI_Preview.cpp:245
-#: src/slic3r/GUI/GUI_Preview.cpp:259
+#: src/slic3r/GUI/GCodeViewer.cpp:3938 src/slic3r/GUI/GUI_Preview.cpp:256
+#: src/slic3r/GUI/GUI_Preview.cpp:271
 msgid "Options"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4019 src/slic3r/GUI/GUI_Preview.cpp:1028
+#: src/slic3r/GUI/GCodeViewer.cpp:3941 src/slic3r/GUI/GUI_Preview.cpp:1051
 msgid "Retractions"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4020 src/slic3r/GUI/GUI_Preview.cpp:1029
+#: src/slic3r/GUI/GCodeViewer.cpp:3942 src/slic3r/GUI/GUI_Preview.cpp:1052
 msgid "Deretractions"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4021 src/slic3r/GUI/GUI_Preview.cpp:1030
+#: src/slic3r/GUI/GCodeViewer.cpp:3943 src/slic3r/GUI/GUI_Preview.cpp:1053
+msgid "Seams"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:3944 src/slic3r/GUI/GUI_Preview.cpp:1054
 msgid "Tool changes"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4022 src/slic3r/GUI/GUI_Preview.cpp:1031
+#: src/slic3r/GUI/GCodeViewer.cpp:3945 src/slic3r/GUI/GUI_Preview.cpp:1055
 msgid "Color changes"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4023 src/slic3r/GUI/GUI_Preview.cpp:1032
+#: src/slic3r/GUI/GCodeViewer.cpp:3946 src/slic3r/GUI/GUI_Preview.cpp:1056
 msgid "Print pauses"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4024 src/slic3r/GUI/GUI_Preview.cpp:1033
+#: src/slic3r/GUI/GCodeViewer.cpp:3947 src/slic3r/GUI/GUI_Preview.cpp:1057
 msgid "Custom G-codes"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4035 src/slic3r/GUI/GCodeViewer.cpp:4059
-#: src/slic3r/GUI/Plater.cpp:694 src/libslic3r/PrintConfig.cpp:117
+#: src/slic3r/GUI/GCodeViewer.cpp:3967 src/slic3r/GUI/GCodeViewer.cpp:3986
+#: src/slic3r/GUI/GUI.cpp:341 src/slic3r/GUI/Plater.cpp:743
+#: src/libslic3r/PrintConfig.cpp:289
 msgid "Printer"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4037 src/slic3r/GUI/GCodeViewer.cpp:4064
-#: src/slic3r/GUI/Plater.cpp:690
+#: src/slic3r/GUI/GCodeViewer.cpp:3969 src/slic3r/GUI/GCodeViewer.cpp:3991
+#: src/slic3r/GUI/GUI.cpp:337 src/slic3r/GUI/Plater.cpp:739
 msgid "Print settings"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4040 src/slic3r/GUI/GCodeViewer.cpp:4070
-#: src/slic3r/GUI/Plater.cpp:691 src/slic3r/GUI/Tab.cpp:1808
-#: src/slic3r/GUI/Tab.cpp:1809
-msgid "Filament"
+#: src/slic3r/GUI/GCodeViewer.cpp:4011
+msgid "Estimated printing times"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4095 src/slic3r/GUI/GCodeViewer.cpp:4100
-#: src/slic3r/GUI/Plater.cpp:242 src/slic3r/GUI/Plater.cpp:1143
-#: src/slic3r/GUI/Plater.cpp:1228
-msgid "Estimated printing time"
-msgstr ""
-
-#: src/slic3r/GUI/GCodeViewer.cpp:4095
+#: src/slic3r/GUI/GCodeViewer.cpp:4030
 msgid "Normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4100
+#: src/slic3r/GUI/GCodeViewer.cpp:4031
 msgid "Stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4128
+#: src/slic3r/GUI/GCodeViewer.cpp:4038 src/libslic3r/PrintConfig.cpp:1147
+#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1175
+#: src/libslic3r/PrintConfig.cpp:1217
+msgid "First layer"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:4039
+msgid "Total"
+msgstr ""
+
+#: src/slic3r/GUI/GCodeViewer.cpp:4069
 msgid "Show stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/GCodeViewer.cpp:4132
+#: src/slic3r/GUI/GCodeViewer.cpp:4073
 msgid "Show normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:236 src/slic3r/GUI/GLCanvas3D.cpp:4619
+#: src/slic3r/GUI/GLCanvas3D.cpp:218 src/slic3r/GUI/GLCanvas3D.cpp:4613
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:53
 msgid "Variable layer height"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:238
+#: src/slic3r/GUI/GLCanvas3D.cpp:220
 msgid "Left mouse button:"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:240
+#: src/slic3r/GUI/GLCanvas3D.cpp:222
 msgid "Add detail"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:242
+#: src/slic3r/GUI/GLCanvas3D.cpp:224
 msgid "Right mouse button:"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:244
+#: src/slic3r/GUI/GLCanvas3D.cpp:226
 msgid "Remove detail"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:246
+#: src/slic3r/GUI/GLCanvas3D.cpp:228
 msgid "Shift + Left mouse button:"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:248
+#: src/slic3r/GUI/GLCanvas3D.cpp:230
 msgid "Reset to base"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:250
+#: src/slic3r/GUI/GLCanvas3D.cpp:232
 msgid "Shift + Right mouse button:"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:252
+#: src/slic3r/GUI/GLCanvas3D.cpp:234
 msgid "Smoothing"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:254
+#: src/slic3r/GUI/GLCanvas3D.cpp:236
 msgid "Mouse wheel:"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:256
+#: src/slic3r/GUI/GLCanvas3D.cpp:238
 msgid "Increase/decrease edit area"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:259
+#: src/slic3r/GUI/GLCanvas3D.cpp:241
 msgid "Adaptive"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:265
+#: src/slic3r/GUI/GLCanvas3D.cpp:247
 msgid "Quality / Speed"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:268
+#: src/slic3r/GUI/GLCanvas3D.cpp:250
 msgid "Higher print quality versus higher print speed."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:279
+#: src/slic3r/GUI/GLCanvas3D.cpp:261
 msgid "Smooth"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:285 src/libslic3r/PrintConfig.cpp:596
+#: src/slic3r/GUI/GLCanvas3D.cpp:267 src/libslic3r/PrintConfig.cpp:781
 msgid "Radius"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:295
+#: src/slic3r/GUI/GLCanvas3D.cpp:277
 msgid "Keep min"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:304 src/slic3r/GUI/GLCanvas3D.cpp:4055
+#: src/slic3r/GUI/GLCanvas3D.cpp:286 src/slic3r/GUI/GLCanvas3D.cpp:4033
 msgid "Reset"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:566
+#: src/slic3r/GUI/GLCanvas3D.cpp:552
 msgid "Variable layer height - Manual edit"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:634
-msgid "An object outside the print area was detected."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:635
-msgid "A toolpath outside the print area was detected."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:636
-msgid "SLA supports outside the print area were detected."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:637
-msgid "Some objects are not visible."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:639
-msgid ""
-"An object outside the print area was detected.\n"
-"Resolve the current problem to continue slicing."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:949
+#: src/slic3r/GUI/GLCanvas3D.cpp:667
 msgid "Seq."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:1455
+#: src/slic3r/GUI/GLCanvas3D.cpp:1259
 msgid "Variable layer height - Reset"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:1463
+#: src/slic3r/GUI/GLCanvas3D.cpp:1267
 msgid "Variable layer height - Adaptive"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:1471
+#: src/slic3r/GUI/GLCanvas3D.cpp:1275
 msgid "Variable layer height - Smooth all"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:1876
+#: src/slic3r/GUI/GLCanvas3D.cpp:1684
 msgid "Mirror Object"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:2746
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:520
+#: src/slic3r/GUI/GLCanvas3D.cpp:2541
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:560
 msgid "Gizmo-Move"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:2832
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:522
+#: src/slic3r/GUI/GLCanvas3D.cpp:2623
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:562
 msgid "Gizmo-Rotate"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3389
+#: src/slic3r/GUI/GLCanvas3D.cpp:3223
 msgid "Move Object"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3859 src/slic3r/GUI/GLCanvas3D.cpp:4580
+#: src/slic3r/GUI/GLCanvas3D.cpp:3743 src/slic3r/GUI/GLCanvas3D.cpp:4574
 msgid "Switch to Settings"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3860 src/slic3r/GUI/GLCanvas3D.cpp:4580
+#: src/slic3r/GUI/GLCanvas3D.cpp:3744 src/slic3r/GUI/GLCanvas3D.cpp:4574
 msgid "Print Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581
+#: src/slic3r/GUI/GLCanvas3D.cpp:3745 src/slic3r/GUI/GLCanvas3D.cpp:4575
 msgid "Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3861 src/slic3r/GUI/GLCanvas3D.cpp:4581
+#: src/slic3r/GUI/GLCanvas3D.cpp:3745 src/slic3r/GUI/GLCanvas3D.cpp:4575
 msgid "Material Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3862 src/slic3r/GUI/GLCanvas3D.cpp:4582
+#: src/slic3r/GUI/GLCanvas3D.cpp:3746 src/slic3r/GUI/GLCanvas3D.cpp:4576
 msgid "Printer Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3914
+#: src/slic3r/GUI/GLCanvas3D.cpp:3893
 msgid "Undo History"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3914
+#: src/slic3r/GUI/GLCanvas3D.cpp:3893
 msgid "Redo History"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3935
+#: src/slic3r/GUI/GLCanvas3D.cpp:3913
 #, possible-c-format
 msgid "Undo %1$d Action"
 msgid_plural "Undo %1$d Actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3935
+#: src/slic3r/GUI/GLCanvas3D.cpp:3913
 #, possible-c-format
 msgid "Redo %1$d Action"
 msgid_plural "Redo %1$d Actions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3955 src/slic3r/GUI/GLCanvas3D.cpp:4598
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:98 src/slic3r/GUI/Search.cpp:348
+#: src/slic3r/GUI/GLCanvas3D.cpp:3933 src/slic3r/GUI/GLCanvas3D.cpp:4592
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:106 src/slic3r/GUI/Search.cpp:423
 msgid "Search"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:3969 src/slic3r/GUI/GLCanvas3D.cpp:3977
-#: src/slic3r/GUI/Search.cpp:355
+#: src/slic3r/GUI/GLCanvas3D.cpp:3947 src/slic3r/GUI/GLCanvas3D.cpp:3955
+#: src/slic3r/GUI/Search.cpp:429
 msgid "Enter a search term"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4008
+#: src/slic3r/GUI/GLCanvas3D.cpp:3986
 msgid "Arrange options"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4038
+#: src/slic3r/GUI/GLCanvas3D.cpp:4016
 msgid "Press %1%left mouse button to enter the exact value"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4040
+#: src/slic3r/GUI/GLCanvas3D.cpp:4018
 msgid "Spacing"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4047
+#: src/slic3r/GUI/GLCanvas3D.cpp:4025
 msgid "Enable rotations (slow)"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4065 src/slic3r/GUI/GLCanvas3D.cpp:4490
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120 src/slic3r/GUI/Plater.cpp:1656
+#: src/slic3r/GUI/GLCanvas3D.cpp:4043 src/slic3r/GUI/GLCanvas3D.cpp:4484
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:132 src/slic3r/GUI/Plater.cpp:1543
 msgid "Arrange"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4464
+#: src/slic3r/GUI/GLCanvas3D.cpp:4458
 msgid "Add..."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4472 src/slic3r/GUI/GUI_ObjectList.cpp:1896
-#: src/slic3r/GUI/Plater.cpp:4019 src/slic3r/GUI/Plater.cpp:4043
-#: src/slic3r/GUI/Tab.cpp:3502
-msgid "Delete"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4481 src/slic3r/GUI/KBShortcutsDialog.cpp:88
-#: src/slic3r/GUI/Plater.cpp:5130
+#: src/slic3r/GUI/GLCanvas3D.cpp:4475 src/slic3r/GUI/KBShortcutsDialog.cpp:96
+#: src/slic3r/GUI/Plater.cpp:5378
 msgid "Delete all"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4490 src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/GLCanvas3D.cpp:4484 src/slic3r/GUI/KBShortcutsDialog.cpp:133
 msgid "Arrange selection"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4490
+#: src/slic3r/GUI/GLCanvas3D.cpp:4484
 msgid "Click right mouse button to show arrangement options"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4512
+#: src/slic3r/GUI/GLCanvas3D.cpp:4506
 msgid "Copy"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4521
+#: src/slic3r/GUI/GLCanvas3D.cpp:4515
 msgid "Paste"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4533 src/slic3r/GUI/Plater.cpp:3878
-#: src/slic3r/GUI/Plater.cpp:3890 src/slic3r/GUI/Plater.cpp:4028
+#: src/slic3r/GUI/GLCanvas3D.cpp:4527 src/slic3r/GUI/GUI_Factories.cpp:1081
+#: src/slic3r/GUI/GUI_Factories.cpp:1105 src/slic3r/GUI/GUI_Factories.cpp:1116
 msgid "Add instance"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4544 src/slic3r/GUI/Plater.cpp:4030
+#: src/slic3r/GUI/GLCanvas3D.cpp:4538 src/slic3r/GUI/GUI_Factories.cpp:1084
 msgid "Remove instance"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4557
+#: src/slic3r/GUI/GLCanvas3D.cpp:4551
 msgid "Split to objects"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4567 src/slic3r/GUI/GUI_ObjectList.cpp:1668
+#: src/slic3r/GUI/GLCanvas3D.cpp:4561
 msgid "Split to parts"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/KBShortcutsDialog.cpp:89
-#: src/slic3r/GUI/MainFrame.cpp:1125
-msgid "Undo"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4669 src/slic3r/GUI/GLCanvas3D.cpp:4708
+#: src/slic3r/GUI/GLCanvas3D.cpp:4675 src/slic3r/GUI/GLCanvas3D.cpp:4714
 msgid "Click right mouse button to open/close History"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4692
+#: src/slic3r/GUI/GLCanvas3D.cpp:4698
 msgid "Next Undo action: %1%"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4708 src/slic3r/GUI/KBShortcutsDialog.cpp:90
-#: src/slic3r/GUI/MainFrame.cpp:1128
+#: src/slic3r/GUI/GLCanvas3D.cpp:4714 src/slic3r/GUI/KBShortcutsDialog.cpp:98
+#: src/slic3r/GUI/MainFrame.cpp:1344
 msgid "Redo"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4730
+#: src/slic3r/GUI/GLCanvas3D.cpp:4736
 msgid "Next Redo action: %1%"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:6354
+#: src/slic3r/GUI/GLCanvas3D.cpp:6358
+msgid "An object outside the print area was detected."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:6359
+msgid "A toolpath outside the print area was detected."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:6360
+msgid "SLA supports outside the print area were detected."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:6361
+msgid "Some objects are not visible during editing."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:6363
+msgid ""
+"An object outside the print area was detected.\n"
+"Resolve the current problem to continue slicing."
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:6437
 msgid "Selection-Add from rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:6373
+#: src/slic3r/GUI/GLCanvas3D.cpp:6452
 msgid "Selection-Remove from rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:54
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:151 src/libslic3r/PrintConfig.cpp:3771
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:160 src/libslic3r/PrintConfig.cpp:4165
 msgid "Cut"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:179
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:399
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:467
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:468
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:410
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:478
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:479
 msgid "in"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:185
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
 msgid "Keep upper part"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:186
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
 msgid "Keep lower part"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:187
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:196
 msgid "Rotate lower part upwards"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:192
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:201
 msgid "Perform cut"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:33
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:32
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:49
 msgid "Paint-on supports"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:42
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:49
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:25
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:57
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:41
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:39
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:114
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:31
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
 msgid "Clipping of view"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:43
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:50
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:26
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:58
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:42
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:113
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:32
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
 msgid "Reset direction"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:44
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:27
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:43
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:115
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:33
 msgid "Brush size"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:45
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:28
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:44
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:116
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:34
 msgid "Brush shape"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:46
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:29
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:45
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:117
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:35
 msgid "Left mouse button"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:46
 msgid "Enforce supports"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:48
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:31
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:119
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:37
 msgid "Right mouse button"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:49
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:373
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:373
 msgid "Block supports"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:50
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:33
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:49
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:121
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:39
 msgid "Shift + Left mouse button"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:51
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:34
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:368
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:378
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:368
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:40
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:281
 msgid "Remove selection"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:52
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:41
 msgid "Remove all selection"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:53
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:52
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:124
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:42
 msgid "Circle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:54
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:37
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1613
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:53
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:125
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:43
+#: src/slic3r/GUI/GUI_Factories.cpp:461
 msgid "Sphere"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:129
-msgid "Autoset by angle"
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:54
+msgid "Highlight by angle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:136
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:118
-msgid "Reset selection"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:160
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:141
-msgid "Alt + Mouse wheel"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:178
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:159
-msgid "Paints all facets inside, regardless of their orientation."
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:192
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:173
-msgid "Ignores facets facing away from the camera."
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:225
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:203
-msgid "Ctrl + Mouse wheel"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:233
-msgid "Autoset custom supports"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:235
-msgid "Threshold:"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:242
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:55
 msgid "Enforce"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:245
-msgid "Block"
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:169
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:507
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:125
+msgid "Reset selection"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:295
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:196
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:441
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:475
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:151
+msgid "Alt + Mouse wheel"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:214
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:398
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:168
+msgid "Paints all facets inside, regardless of their orientation."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:228
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:412
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:182
+msgid "Ignores facets facing away from the camera."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:262
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:500
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:215
+msgid "Ctrl + Mouse wheel"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:303
 msgid "Block supports by angle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:296
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:304
 msgid "Add supports by angle"
 msgstr ""
 
+#: src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp:371
+msgid "Add supports"
+msgstr ""
+
 #: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:40
 msgid "Place on face"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:40
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:30
 msgid "Hollow this object"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:31
 msgid "Preview hollowed and drilled model"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:42
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:32
 msgid "Offset"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:43
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:56
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:33
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:57
 msgid "Quality"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:44
-#: src/libslic3r/PrintConfig.cpp:3272
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:34
+#: src/libslic3r/PrintConfig.cpp:3652
 msgid "Closing distance"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:45
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:35
 msgid "Hole diameter"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:46
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:36
 msgid "Hole depth"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:37
 msgid "Remove selected holes"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:38
 msgid "Remove all holes"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:51
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:41
 msgid "Show supports"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:308
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:286
 msgid "Add drainage hole"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:424
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:402
 msgid "Delete drainage hole"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:624
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:605
 msgid "Hollowing parameter change"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:693
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:682
 msgid "Change drainage hole diameter"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:785
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:776
 msgid "Hollow and drill"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:835
+#: src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp:826
 msgid "Move drainage hole"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:64
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:27
+msgid ""
+"Your printer has more extruders than the multi-material painting gizmo "
+"supports. For this reason, only the first %1% extruders will be able to be "
+"used for painting."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:46
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:51
+msgid "Multimaterial painting"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:118
+msgid "First color"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:120
+msgid "Second color"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:122
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:696
+msgid "Remove painted color"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:123
+msgid "Remove all painted areas"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:126
+msgid "Pointer"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:128
+msgid "Tool type"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:129
+msgid "Brush"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:130
+msgid "Smart fill"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:131
+msgid "Bucket fill"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:133
+msgid "Smart fill angle"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
+msgid "Paints facets according to the chosen painting brush."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:360
+msgid ""
+"Paints neighboring facets whose relative angle is less or equal to set angle."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:378
+msgid "Paints neighboring facets that have the same color."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:426
+msgid "Paints only one facet."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:446
+msgid "Split triangles"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:451
+msgid "Split bigger facets into smaller ones while the object is painted."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:699
+msgid "Painted using: Extruder %1%"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:55
 msgid "Move"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:461
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:508
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:527
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:543
-#: src/libslic3r/PrintConfig.cpp:3820
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:466
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:544
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:563
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:579
+#: src/libslic3r/PrintConfig.cpp:4219
 msgid "Rotate"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:78
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:219
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:528
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:544
-#: src/libslic3r/PrintConfig.cpp:3835
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:505
+msgid "Optimize orientation"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:517
+msgid "Choose goal"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:538
+msgid "Optimize"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:79
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:217
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:564
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:580
+#: src/libslic3r/PrintConfig.cpp:4234
 msgid "Scale"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:30
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:381
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:284
 msgid "Enforce seam"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:32
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:383
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:38
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:286
 msgid "Block seam"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:46
+#: src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp:52
 msgid "Seam painting"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:28
+msgid "Mesh name"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:29
+#: src/libslic3r/PrintConfig.cpp:1131
+msgid "Triangles"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:30
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:224
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:230 src/slic3r/GUI/Plater.cpp:4375
+#: src/slic3r/GUI/Tab.cpp:2753
+msgid "Preview"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:31
+msgid "Detail level"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:32
+msgid "Decimate ratio"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:53
+msgid "Simplify"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:153
+msgid "Extra high"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:154
+msgid "High"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:155
+msgid "Medium"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:156
+msgid "Low"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:157
+msgid "Extra low"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:206
+#, possible-c-format
+msgid "%d triangles"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:209
+msgid "Show wireframe"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:230
+msgid "Apply"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:249
+#, possible-c-format
+msgid "Process %d / 100"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:288
+msgid "Model simplification has been canceled"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:295
+msgid "Simplify "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:372
+msgid "ERROR: Wait until Simplification ends or Cancel process."
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:39
 msgid "Head diameter"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:40
 msgid "Lock supports under new islands"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:49
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1218
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:41
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1214
 msgid "Remove selected points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:50
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:42
 msgid "Remove all points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:51
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1221
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:43
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1217
 msgid "Apply changes"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:52
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1222
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:44
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1218
 msgid "Discard changes"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:53
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:45
 msgid "Minimal points distance"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:54
-#: src/libslic3r/PrintConfig.cpp:3102
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:46
+#: src/libslic3r/PrintConfig.cpp:3482
 msgid "Support points density"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:55
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1224
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:47
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1220
 msgid "Auto-generate points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:56
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:48
 msgid "Manual editing"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:374
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:372
 msgid "Add support point"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:514
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:513
 msgid "Delete support point"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:694
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:693
 msgid "Change point head diameter"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:762
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:761
 msgid "Support parameter change"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:869
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:867
 msgid "SLA Support Points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897
-msgid "SLA gizmo turned on"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:911
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:888
 msgid "Do you want to save your manually edited support points?"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:912
-msgid "Save changes?"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:889
+msgid "Save support points?"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:924
-msgid "SLA gizmo turned off"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:955
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:949
 msgid "Move support point"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1048
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1042
 msgid "Support points edit"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1127
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1122
 msgid "Autogeneration will erase all manually edited points."
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1128
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1123
 msgid "Are you sure you want to do it?"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1129 src/slic3r/GUI/GUI.cpp:262
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:557
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:586
-#: src/slic3r/GUI/WipeTowerDialog.cpp:45 src/slic3r/GUI/WipeTowerDialog.cpp:366
-msgid "Warning"
-msgstr ""
-
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1134
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1129
 msgid "Autogenerate support points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1181
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1177
 msgid "SLA gizmo keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1192
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1188
 msgid "Note: some shortcuts work in (non)editing mode only."
 msgstr ""
 
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1206
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1209
 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1210
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1214
 msgid "Left click"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1210
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1206
 msgid "Add point"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1207
 msgid "Right click"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1207
 msgid "Remove point"
 msgstr ""
 
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1208
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211
 #: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1212
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1216
 msgid "Drag"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1212
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1208
 msgid "Move point"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1209
 msgid "Add point to selection"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1214
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1210
 msgid "Remove point from selection"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1211
 msgid "Select by rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1216
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1212
 msgid "Deselect by rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1217
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213
 msgid "Select all points"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215
 msgid "Mouse wheel"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1215
 msgid "Move clipping plane"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1220
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1216
 msgid "Reset clipping plane"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1223
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1219
 msgid "Switch to editing mode"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:521
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:196
+msgid ""
+"ERROR: Please close all manipulators available from the left toolbar first"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:561
 msgid "Gizmo-Scale"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:630
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:673
 msgid "Gizmo-Place on Face"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:39
-msgid "Entering Paint-on supports"
+#: src/slic3r/GUI/Gizmos/GLGizmosManager.cpp:1260
+msgid ""
+"You are currently editing SLA support points. Please, apply or discard your "
+"changes first."
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:40
-msgid "Entering Seam painting"
+#: src/slic3r/GUI/GUI.cpp:207
+msgid "Internal error when changing value for %1%: %2%"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:47
-msgid "Leaving Seam painting"
+#: src/slic3r/GUI/GUI.cpp:292
+msgid "Undefined"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:48
-msgid "Leaving Paint-on supports"
+#: src/slic3r/GUI/GUI.cpp:317
+msgid "%1% was substituted with %2%"
 msgstr ""
 
-#: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:371
-msgid "Add supports"
+#: src/slic3r/GUI/GUI.cpp:326
+msgid ""
+"Most likely the configuration was produced by a newer version of PrusaSlicer "
+"or by some PrusaSlicer fork."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:247
+#: src/slic3r/GUI/GUI.cpp:327
+msgid "The following values were substituted:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:328
+msgid "Review the substitutions and adjust them if needed."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:338 src/slic3r/GUI/Plater.cpp:741
+msgid "SLA print settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:342 src/slic3r/GUI/PhysicalPrinterDialog.cpp:157
+msgid "Physical Printer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:355
+msgid ""
+"Configuration bundle was loaded, however some configuration values were not "
+"recognized."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:365
+msgid ""
+"Configuration file \"%1%\" was loaded, however some configuration values "
+"were not recognized."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:259
 msgid "is based on Slic3r by Alessandro Ranellucci and the RepRap community."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:249
+#: src/slic3r/GUI/GUI_App.cpp:260
+msgid "Developed by Prusa Research."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:262
 msgid ""
 "Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas "
 "Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:250
-msgid "Artwork model by Nora Al-Badri and Jan Nikolai Nelles"
+#: src/slic3r/GUI/GUI_App.cpp:263
+msgid "Artwork model by M Boyer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:391
+#: src/slic3r/GUI/GUI_App.cpp:404
 msgid ""
 "Starting with %1% 2.3, configuration directory on Linux has changed "
 "(according to XDG Base Directory Specification) to \n"
@@ -2501,20 +2969,20 @@ msgid ""
 "What do you want to do now?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:399
+#: src/slic3r/GUI/GUI_App.cpp:412
 #, possible-c-format
 msgid "%s - BREAKING CHANGE"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:401
+#: src/slic3r/GUI/GUI_App.cpp:414
 msgid "Quit, I will move my data now"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:401
+#: src/slic3r/GUI/GUI_App.cpp:414
 msgid "Start the application"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:589
+#: src/slic3r/GUI/GUI_App.cpp:604
 #, possible-c-format
 msgid ""
 "%s has encountered an error. It was likely caused by running out of memory. "
@@ -2524,11 +2992,11 @@ msgid ""
 "The application will now terminate."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:592
+#: src/slic3r/GUI/GUI_App.cpp:607
 msgid "Fatal error"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:596
+#: src/slic3r/GUI/GUI_App.cpp:611
 msgid ""
 "PrusaSlicer has encountered a localization error. Please report to "
 "PrusaSlicer team, what language was active and in which scenario this issue "
@@ -2537,261 +3005,677 @@ msgid ""
 "The application will now terminate."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:599
+#: src/slic3r/GUI/GUI_App.cpp:614
 msgid "Critical error"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:726
+#: src/slic3r/GUI/GUI_App.cpp:619
+msgid "Internal error: %1%"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:778
 msgid ""
 "Error parsing PrusaSlicer config file, it is probably corrupted. Try to "
 "manually delete the file to recover from the error. Your user profiles will "
 "not be affected."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:732
+#: src/slic3r/GUI/GUI_App.cpp:784
 msgid ""
 "Error parsing PrusaGCodeViewer config file, it is probably corrupted. Try to "
 "manually delete the file to recover from the error."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:787
+#: src/slic3r/GUI/GUI_App.cpp:847
 #, possible-c-format
 msgid ""
 "%s\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:789 src/slic3r/GUI/UnsavedChangesDialog.cpp:665
+#: src/slic3r/GUI/GUI_App.cpp:849 src/slic3r/GUI/GUI_App.cpp:2647
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:888
 msgid "Remember my choice"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:827
+#: src/slic3r/GUI/GUI_App.cpp:891
 msgid "Loading configuration"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:892
+#: src/slic3r/GUI/GUI_App.cpp:953
 msgid "Preparing settings tabs"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1149
+#: src/slic3r/GUI/GUI_App.cpp:1304
 msgid ""
 "You have the following presets with saved options for \"Print Host upload\""
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1153
+#: src/slic3r/GUI/GUI_App.cpp:1308
 msgid ""
 "But since this version of PrusaSlicer we don't show this information in "
 "Printer Settings anymore.\n"
 "Settings will be available in physical printers settings."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1155
+#: src/slic3r/GUI/GUI_App.cpp:1310
 msgid ""
 "By default new Printer devices will be named as \"Printer N\" during its "
 "creation.\n"
 "Note: This name can be changed later from the physical printers settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1158 src/slic3r/GUI/PhysicalPrinterDialog.cpp:631
+#: src/slic3r/GUI/GUI_App.cpp:1314 src/slic3r/GUI/PhysicalPrinterDialog.cpp:717
 msgid "Information"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1171 src/slic3r/GUI/GUI_App.cpp:1182
+#: src/slic3r/GUI/GUI_App.cpp:1327 src/slic3r/GUI/GUI_App.cpp:1338
 msgid "Recreating"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1187
+#: src/slic3r/GUI/GUI_App.cpp:1341
 msgid "Loading of current presets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1192
+#: src/slic3r/GUI/GUI_App.cpp:1346
 msgid "Loading of a mode view"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1269
+#: src/slic3r/GUI/GUI_App.cpp:1439
 msgid "Choose one file (3MF/AMF):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1281
+#: src/slic3r/GUI/GUI_App.cpp:1451
 msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1293
+#: src/slic3r/GUI/GUI_App.cpp:1463
 msgid "Choose one file (GCODE/.GCO/.G/.ngc/NGC):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1304
+#: src/slic3r/GUI/GUI_App.cpp:1474
 msgid "Changing of an application language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1427
+#: src/slic3r/GUI/GUI_App.cpp:1613
 msgid "Select the language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1427
+#: src/slic3r/GUI/GUI_App.cpp:1613
 msgid "Language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1576
+#: src/slic3r/GUI/GUI_App.cpp:1762
 msgid "modified"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1625
+#: src/slic3r/GUI/GUI_App.cpp:1816
 #, possible-c-format
 msgid "Run %s"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1629
+#: src/slic3r/GUI/GUI_App.cpp:1820
 msgid "&Configuration Snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1629
+#: src/slic3r/GUI/GUI_App.cpp:1820
 msgid "Inspect / activate configuration snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1630
+#: src/slic3r/GUI/GUI_App.cpp:1821
 msgid "Take Configuration &Snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1630
+#: src/slic3r/GUI/GUI_App.cpp:1821
 msgid "Capture a configuration snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1631
+#: src/slic3r/GUI/GUI_App.cpp:1822
 msgid "Check for updates"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1631
+#: src/slic3r/GUI/GUI_App.cpp:1822
 msgid "Check for configuration updates"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1634
+#: src/slic3r/GUI/GUI_App.cpp:1829
 msgid "&Preferences"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1640
+#: src/slic3r/GUI/GUI_App.cpp:1835
 msgid "Application preferences"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1645 src/slic3r/GUI/wxExtensions.cpp:685
+#: src/slic3r/GUI/GUI_App.cpp:1840 src/slic3r/GUI/wxExtensions.cpp:706
 msgid "Simple"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1645
+#: src/slic3r/GUI/GUI_App.cpp:1840
 msgid "Simple View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1647 src/slic3r/GUI/wxExtensions.cpp:687
+#: src/slic3r/GUI/GUI_App.cpp:1842 src/slic3r/GUI/wxExtensions.cpp:708
 msgctxt "Mode"
 msgid "Advanced"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1647
+#: src/slic3r/GUI/GUI_App.cpp:1842
 msgid "Advanced View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1648 src/slic3r/GUI/wxExtensions.cpp:688
+#: src/slic3r/GUI/GUI_App.cpp:1843 src/slic3r/GUI/wxExtensions.cpp:709
 msgid "Expert"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1648
+#: src/slic3r/GUI/GUI_App.cpp:1843
 msgid "Expert View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1653
+#: src/slic3r/GUI/GUI_App.cpp:1848
 msgid "Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1653
+#: src/slic3r/GUI/GUI_App.cpp:1848
 #, possible-c-format
 msgid "%s View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1656
+#: src/slic3r/GUI/GUI_App.cpp:1851
 msgid "&Language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1659
+#: src/slic3r/GUI/GUI_App.cpp:1854
 msgid "Flash printer &firmware"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1659
+#: src/slic3r/GUI/GUI_App.cpp:1854
 msgid "Upload a firmware image into an Arduino based printer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1675
-msgid "Taking configuration snapshot"
+#: src/slic3r/GUI/GUI_App.cpp:1874
+msgid "Taking a configuration snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1675
+#: src/slic3r/GUI/GUI_App.cpp:1875
+msgid ""
+"Some presets are modified and the unsaved changes will not be captured by "
+"the configuration snapshot."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:1876
 msgid "Snapshot name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1704
+#: src/slic3r/GUI/GUI_App.cpp:1892
+msgid "Loading a configuration snapshot"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:1901
+msgid "Continue to activate a configuration snapshot %1%?"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:1915
 msgid "Failed to activate configuration snapshot."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1754
+#: src/slic3r/GUI/GUI_App.cpp:1934
+msgid "Restart application"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:1968
 msgid "Language selection"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1756
+#: src/slic3r/GUI/GUI_App.cpp:1971
 msgid ""
 "Switching the language will trigger application restart.\n"
 "You will lose content of the plater."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1758
+#: src/slic3r/GUI/GUI_App.cpp:1973 src/slic3r/GUI/Preferences.cpp:440
 msgid "Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1785
+#: src/slic3r/GUI/GUI_App.cpp:2000
 msgid "&Configuration"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1816
+#: src/slic3r/GUI/GUI_App.cpp:2117 src/slic3r/GUI/GUI_App.cpp:2178
 msgid "The preset modifications are successfully saved"
 msgid_plural "The presets modifications are successfully saved"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1838
+#: src/slic3r/GUI/GUI_App.cpp:2181
+msgid "For new project all modifications will be reseted"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:2219
+msgid "Loading a new project while the current project is modified."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:2222
+msgid "Project is loading"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:2222
+msgid "Loading a new project while some presets are modified."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:2241
 msgid "The uploads are still ongoing"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1838
+#: src/slic3r/GUI/GUI_App.cpp:2241
 msgid "Stop them and continue anyway?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:1841
+#: src/slic3r/GUI/GUI_App.cpp:2245
 msgid "Ongoing uploads"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:2052 src/slic3r/GUI/Tab.cpp:3256
+#: src/slic3r/GUI/GUI_App.cpp:2446
 msgid "It's impossible to print multi-part object(s) with SLA technology."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:2053
-msgid "Please check and fix your object list."
+#: src/slic3r/GUI/GUI_App.cpp:2447 src/slic3r/GUI/Jobs/SLAImportJob.cpp:224
+#: src/slic3r/GUI/Plater.cpp:2296
+msgid "Please check your object list before preset changing."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:2054 src/slic3r/GUI/Jobs/SLAImportJob.cpp:210
-#: src/slic3r/GUI/Plater.cpp:2367 src/slic3r/GUI/Tab.cpp:3258
-msgid "Attention!"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:2071
+#: src/slic3r/GUI/GUI_App.cpp:2496
 msgid "Select a gcode file:"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Init.cpp:88 src/slic3r/GUI/GUI_Init.cpp:91
+#: src/slic3r/GUI/GUI_App.cpp:2646
+msgid "Should we open this hyperlink in your default browser?"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:2646
+msgid "PrusaSlicer: Open hyperlink"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Init.cpp:57 src/slic3r/GUI/GUI_Init.cpp:60
 msgid "PrusaSlicer GUI initialization failed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Init.cpp:91
+#: src/slic3r/GUI/GUI_Init.cpp:60
 msgid "Fatal error, exception catched: %1%"
 msgstr ""
 
+#: src/slic3r/GUI/GUI_Factories.cpp:54 src/slic3r/GUI/GUI_Factories.cpp:127
+#: src/libslic3r/PrintConfig.cpp:254 src/libslic3r/PrintConfig.cpp:371
+#: src/libslic3r/PrintConfig.cpp:413 src/libslic3r/PrintConfig.cpp:422
+#: src/libslic3r/PrintConfig.cpp:674 src/libslic3r/PrintConfig.cpp:740
+#: src/libslic3r/PrintConfig.cpp:748 src/libslic3r/PrintConfig.cpp:1189
+#: src/libslic3r/PrintConfig.cpp:1272 src/libslic3r/PrintConfig.cpp:1488
+#: src/libslic3r/PrintConfig.cpp:1878 src/libslic3r/PrintConfig.cpp:1944
+#: src/libslic3r/PrintConfig.cpp:2166 src/libslic3r/PrintConfig.cpp:2747
+#: src/libslic3r/PrintConfig.cpp:2754 src/libslic3r/PrintConfig.cpp:2813
+#: src/libslic3r/PrintConfig.cpp:2822
+msgid "Layers and Perimeters"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:56 src/slic3r/GUI/GUI_Factories.cpp:131
+#: src/slic3r/GUI/GUI_Preview.cpp:248 src/slic3r/GUI/Tab.cpp:1532
+#: src/slic3r/GUI/Tab.cpp:1534 src/libslic3r/ExtrusionEntity.cpp:322
+#: src/libslic3r/ExtrusionEntity.cpp:354 src/libslic3r/PrintConfig.cpp:636
+#: src/libslic3r/PrintConfig.cpp:2009 src/libslic3r/PrintConfig.cpp:2018
+#: src/libslic3r/PrintConfig.cpp:2027 src/libslic3r/PrintConfig.cpp:2037
+#: src/libslic3r/PrintConfig.cpp:2046 src/libslic3r/PrintConfig.cpp:2455
+#: src/libslic3r/PrintConfig.cpp:2461 src/libslic3r/PrintConfig.cpp:2469
+#: src/libslic3r/PrintConfig.cpp:2481 src/libslic3r/PrintConfig.cpp:2491
+#: src/libslic3r/PrintConfig.cpp:2499 src/libslic3r/PrintConfig.cpp:2517
+#: src/libslic3r/PrintConfig.cpp:2533 src/libslic3r/PrintConfig.cpp:2554
+#: src/libslic3r/PrintConfig.cpp:2566 src/libslic3r/PrintConfig.cpp:2583
+#: src/libslic3r/PrintConfig.cpp:2601 src/libslic3r/PrintConfig.cpp:2615
+#: src/libslic3r/PrintConfig.cpp:2625 src/libslic3r/PrintConfig.cpp:2634
+#: src/libslic3r/PrintConfig.cpp:2645 src/libslic3r/PrintConfig.cpp:2659
+#: src/libslic3r/PrintConfig.cpp:2675 src/libslic3r/PrintConfig.cpp:2683
+#: src/libslic3r/PrintConfig.cpp:2684 src/libslic3r/PrintConfig.cpp:2693
+#: src/libslic3r/PrintConfig.cpp:2707 src/libslic3r/PrintConfig.cpp:2715
+#: src/libslic3r/PrintConfig.cpp:2729
+msgid "Support material"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:59 src/slic3r/GUI/GUI_Factories.cpp:135
+#: src/libslic3r/PrintConfig.cpp:2949 src/libslic3r/PrintConfig.cpp:2957
+msgid "Wipe options"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:65
+msgid "Pad and Support"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:129 src/slic3r/GUI/GUI_Preview.cpp:244
+#: src/slic3r/GUI/Tab.cpp:1500 src/libslic3r/ExtrusionEntity.cpp:318
+#: src/libslic3r/ExtrusionEntity.cpp:346 src/libslic3r/PrintConfig.cpp:1504
+#: src/libslic3r/PrintConfig.cpp:1510 src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1542
+#: src/libslic3r/PrintConfig.cpp:1544
+msgid "Ironing"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:130 src/libslic3r/PrintConfig.cpp:1238
+#: src/libslic3r/PrintConfig.cpp:1239 src/libslic3r/PrintConfig.cpp:1254
+#: src/libslic3r/PrintConfig.cpp:1263
+msgid "Fuzzy Skin"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:132 src/slic3r/GUI/GUI_Preview.cpp:219
+#: src/slic3r/GUI/Tab.cpp:1566 src/libslic3r/PrintConfig.cpp:473
+#: src/libslic3r/PrintConfig.cpp:728 src/libslic3r/PrintConfig.cpp:1279
+#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:1543
+#: src/libslic3r/PrintConfig.cpp:1934 src/libslic3r/PrintConfig.cpp:2254
+#: src/libslic3r/PrintConfig.cpp:2306 src/libslic3r/PrintConfig.cpp:2798
+msgid "Speed"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:133 src/slic3r/GUI/Tab.cpp:1605
+#: src/slic3r/GUI/Tab.cpp:2228 src/libslic3r/PrintConfig.cpp:758
+#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1912
+#: src/libslic3r/PrintConfig.cpp:2275 src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2573
+msgid "Extruders"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:134 src/libslic3r/PrintConfig.cpp:717
+#: src/libslic3r/PrintConfig.cpp:826 src/libslic3r/PrintConfig.cpp:1176
+#: src/libslic3r/PrintConfig.cpp:1423 src/libslic3r/PrintConfig.cpp:1921
+#: src/libslic3r/PrintConfig.cpp:2295 src/libslic3r/PrintConfig.cpp:2555
+#: src/libslic3r/PrintConfig.cpp:2786
+msgid "Extrusion Width"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:136 src/slic3r/GUI/Tab.cpp:1518
+#: src/libslic3r/PrintConfig.cpp:483 src/libslic3r/PrintConfig.cpp:494
+#: src/libslic3r/PrintConfig.cpp:510
+msgid "Skirt and brim"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:138 src/slic3r/GUI/Tab.cpp:1478
+#: src/slic3r/GUI/Tab.cpp:1510 src/slic3r/GUI/Tab.cpp:1627
+#: src/slic3r/GUI/Tab.cpp:1631 src/slic3r/GUI/Tab.cpp:1955
+#: src/slic3r/GUI/Tab.cpp:2322 src/slic3r/GUI/Tab.cpp:4334
+#: src/libslic3r/PrintConfig.cpp:237 src/libslic3r/PrintConfig.cpp:461
+#: src/libslic3r/PrintConfig.cpp:1366 src/libslic3r/PrintConfig.cpp:1450
+#: src/libslic3r/PrintConfig.cpp:1497 src/libslic3r/PrintConfig.cpp:2431
+#: src/libslic3r/PrintConfig.cpp:2441 src/libslic3r/PrintConfig.cpp:2973
+#: src/libslic3r/PrintConfig.cpp:3145
+msgid "Advanced"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:140 src/slic3r/GUI/Plater.cpp:384
+#: src/slic3r/GUI/Tab.cpp:4268 src/slic3r/GUI/Tab.cpp:4269
+#: src/libslic3r/PrintConfig.cpp:3311 src/libslic3r/PrintConfig.cpp:3318
+#: src/libslic3r/PrintConfig.cpp:3327 src/libslic3r/PrintConfig.cpp:3336
+#: src/libslic3r/PrintConfig.cpp:3346 src/libslic3r/PrintConfig.cpp:3356
+#: src/libslic3r/PrintConfig.cpp:3393 src/libslic3r/PrintConfig.cpp:3400
+#: src/libslic3r/PrintConfig.cpp:3411 src/libslic3r/PrintConfig.cpp:3421
+#: src/libslic3r/PrintConfig.cpp:3430 src/libslic3r/PrintConfig.cpp:3443
+#: src/libslic3r/PrintConfig.cpp:3453 src/libslic3r/PrintConfig.cpp:3462
+#: src/libslic3r/PrintConfig.cpp:3472 src/libslic3r/PrintConfig.cpp:3483
+#: src/libslic3r/PrintConfig.cpp:3491
+msgid "Supports"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:141 src/slic3r/GUI/Plater.cpp:529
+#: src/slic3r/GUI/Tab.cpp:4309 src/slic3r/GUI/Tab.cpp:4310
+#: src/slic3r/GUI/Tab.cpp:4382 src/libslic3r/PrintConfig.cpp:3499
+#: src/libslic3r/PrintConfig.cpp:3506 src/libslic3r/PrintConfig.cpp:3520
+#: src/libslic3r/PrintConfig.cpp:3531 src/libslic3r/PrintConfig.cpp:3541
+#: src/libslic3r/PrintConfig.cpp:3563 src/libslic3r/PrintConfig.cpp:3574
+#: src/libslic3r/PrintConfig.cpp:3581 src/libslic3r/PrintConfig.cpp:3588
+#: src/libslic3r/PrintConfig.cpp:3599 src/libslic3r/PrintConfig.cpp:3608
+#: src/libslic3r/PrintConfig.cpp:3617
+msgid "Pad"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:142 src/slic3r/GUI/Tab.cpp:4327
+#: src/slic3r/GUI/Tab.cpp:4328 src/libslic3r/SLA/Hollowing.cpp:72
+#: src/libslic3r/SLA/Hollowing.cpp:84 src/libslic3r/SLA/Hollowing.cpp:91
+#: src/libslic3r/SLA/Hollowing.cpp:100 src/libslic3r/PrintConfig.cpp:3627
+#: src/libslic3r/PrintConfig.cpp:3634 src/libslic3r/PrintConfig.cpp:3644
+#: src/libslic3r/PrintConfig.cpp:3653
+msgid "Hollowing"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:160
+msgid "Add part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:161
+msgid "Add negative volume"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:162
+msgid "Add modifier"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:163
+msgid "Add support blocker"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:164
+msgid "Add support enforcer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:300
+msgid "Select showing settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:407 src/slic3r/GUI/GUI_Factories.cpp:412
+#: src/slic3r/GUI/GUI_Factories.cpp:550 src/slic3r/GUI/GUI_Factories.cpp:556
+#, possible-c-format
+msgid "Quick Add Settings (%s)"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:444
+msgid "Remove the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:456
+msgid "Load"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:461 src/slic3r/GUI/GUI_Factories.cpp:497
+#: src/slic3r/GUI/GUI_Factories.cpp:501
+msgid "Box"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:461
+msgid "Cylinder"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:461
+msgid "Slab"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:471
+msgid "Gallery"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:520
+msgid "Height range Modifier"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:529
+msgid "Add settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:620
+msgid "Change type"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:630 src/slic3r/GUI/GUI_Factories.cpp:642
+msgid "Set as a Separated Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:642
+msgid "Set as a Separated Objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:652
+msgid "Printable"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:680
+msgid "Rename"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:690
+msgid "Fix through the Netfabb"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:699 src/slic3r/GUI/Plater.cpp:3731
+msgid "Simplify model"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:709
+msgid "Export as STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:720
+msgid "Reload the selected volumes from disk"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:727 src/slic3r/GUI/Plater.cpp:3345
+#: src/slic3r/GUI/Plater.cpp:3371
+msgid "Replace with STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:727
+msgid "Replace the selected volume with new STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:734
+msgid "Set extruder for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:772 src/slic3r/Utils/Repetier.cpp:124
+#: src/slic3r/Utils/Repetier.cpp:203 src/libslic3r/PrintConfig.cpp:601
+#: src/libslic3r/PrintConfig.cpp:2667
+msgid "Default"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:789
+msgid "Scale to print volume"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:789
+msgid "Scale the selected object to fit the print volume"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:828 src/slic3r/GUI/Plater.cpp:5518
+msgid "Convert from imperial units"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:829 src/slic3r/GUI/Plater.cpp:5519
+msgid "Revert conversion from imperial units"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:830 src/slic3r/GUI/Plater.cpp:5520
+msgid "Convert from meters"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:831 src/slic3r/GUI/Plater.cpp:5520
+msgid "Revert conversion from meters"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:852 src/slic3r/GUI/GUI_ObjectList.cpp:2123
+#: src/libslic3r/PrintConfig.cpp:4210
+msgid "Merge"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:852
+msgid "Merge objects to the one multipart object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:871
+msgid "Along X axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:871
+msgid "Mirror the selected object along the X axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:873
+msgid "Along Y axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:873
+msgid "Mirror the selected object along the Y axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:875
+msgid "Along Z axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:875
+msgid "Mirror the selected object along the Z axis"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:878
+msgid "Mirror"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:878
+msgid "Mirror the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:894 src/slic3r/GUI/GUI_ObjectList.cpp:1677
+msgid "Add Shape"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:930
+msgid "To objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:930 src/slic3r/GUI/GUI_Factories.cpp:951
+msgid "Split the selected object into individual objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:933
+msgid "To parts"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:933 src/slic3r/GUI/GUI_Factories.cpp:972
+msgid "Split the selected object into individual parts"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:937 src/slic3r/GUI/GUI_Factories.cpp:951
+#: src/slic3r/GUI/GUI_Factories.cpp:972 src/libslic3r/PrintConfig.cpp:4239
+msgid "Split"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:937
+msgid "Split the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1081
+msgid "Add one more instance of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1084
+msgid "Remove one instance of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1087
+msgid "Set number of instances"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1087
+msgid "Change the number of instances of the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1091
+msgid "Fill bed with instances"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Factories.cpp:1091
+msgid "Fill the remaining area of bed with instances of the selected object"
+msgstr ""
+
 #: src/slic3r/GUI/GUI_ObjectLayers.cpp:29
 msgid "Start at height"
 msgstr ""
@@ -2800,522 +3684,322 @@ msgstr ""
 msgid "Stop at height"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:161
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:160
 msgid "Remove layer range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectLayers.cpp:165
+#: src/slic3r/GUI/GUI_ObjectLayers.cpp:164
 msgid "Add layer range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_ObjectList.cpp:92
-#: src/slic3r/GUI/GUI_ObjectList.cpp:681 src/libslic3r/PrintConfig.cpp:74
-#: src/libslic3r/PrintConfig.cpp:189 src/libslic3r/PrintConfig.cpp:231
-#: src/libslic3r/PrintConfig.cpp:240 src/libslic3r/PrintConfig.cpp:489
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:563
-#: src/libslic3r/PrintConfig.cpp:995 src/libslic3r/PrintConfig.cpp:1308
-#: src/libslic3r/PrintConfig.cpp:1673 src/libslic3r/PrintConfig.cpp:1739
-#: src/libslic3r/PrintConfig.cpp:1924 src/libslic3r/PrintConfig.cpp:2391
-#: src/libslic3r/PrintConfig.cpp:2450 src/libslic3r/PrintConfig.cpp:2459
-msgid "Layers and Perimeters"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/slic3r/GUI/GUI_ObjectList.cpp:95
-#: src/slic3r/GUI/GUI_ObjectList.cpp:684 src/slic3r/GUI/GUI_Preview.cpp:237
-#: src/slic3r/GUI/Tab.cpp:1486 src/slic3r/GUI/Tab.cpp:1488
-#: src/libslic3r/ExtrusionEntity.cpp:320 src/libslic3r/ExtrusionEntity.cpp:352
-#: src/libslic3r/PrintConfig.cpp:451 src/libslic3r/PrintConfig.cpp:1804
-#: src/libslic3r/PrintConfig.cpp:2182 src/libslic3r/PrintConfig.cpp:2188
-#: src/libslic3r/PrintConfig.cpp:2196 src/libslic3r/PrintConfig.cpp:2208
-#: src/libslic3r/PrintConfig.cpp:2218 src/libslic3r/PrintConfig.cpp:2226
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2262
-#: src/libslic3r/PrintConfig.cpp:2274 src/libslic3r/PrintConfig.cpp:2290
-#: src/libslic3r/PrintConfig.cpp:2299 src/libslic3r/PrintConfig.cpp:2308
-#: src/libslic3r/PrintConfig.cpp:2319 src/libslic3r/PrintConfig.cpp:2333
-#: src/libslic3r/PrintConfig.cpp:2341 src/libslic3r/PrintConfig.cpp:2342
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Support material"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:39 src/slic3r/GUI/GUI_ObjectList.cpp:99
-#: src/slic3r/GUI/GUI_ObjectList.cpp:688 src/libslic3r/PrintConfig.cpp:2569
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "Wipe options"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:45
-msgid "Pad and Support"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:51
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:52
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:53
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:54
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:94 src/slic3r/GUI/GUI_ObjectList.cpp:683
-#: src/slic3r/GUI/GUI_Preview.cpp:233 src/slic3r/GUI/Tab.cpp:1454
-#: src/libslic3r/ExtrusionEntity.cpp:316 src/libslic3r/ExtrusionEntity.cpp:344
-#: src/libslic3r/PrintConfig.cpp:1315 src/libslic3r/PrintConfig.cpp:1321
-#: src/libslic3r/PrintConfig.cpp:1335 src/libslic3r/PrintConfig.cpp:1345
-#: src/libslic3r/PrintConfig.cpp:1353 src/libslic3r/PrintConfig.cpp:1355
-msgid "Ironing"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:96 src/slic3r/GUI/GUI_ObjectList.cpp:685
-#: src/slic3r/GUI/GUI_Preview.cpp:214 src/slic3r/GUI/Tab.cpp:1512
-#: src/libslic3r/PrintConfig.cpp:291 src/libslic3r/PrintConfig.cpp:543
-#: src/libslic3r/PrintConfig.cpp:1101 src/libslic3r/PrintConfig.cpp:1281
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1729
-#: src/libslic3r/PrintConfig.cpp:2005 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2435
-msgid "Speed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:97 src/slic3r/GUI/GUI_ObjectList.cpp:686
-#: src/slic3r/GUI/Tab.cpp:1548 src/slic3r/GUI/Tab.cpp:2126
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:1235
-#: src/libslic3r/PrintConfig.cpp:1707 src/libslic3r/PrintConfig.cpp:2026
-#: src/libslic3r/PrintConfig.cpp:2254 src/libslic3r/PrintConfig.cpp:2281
-msgid "Extruders"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:98 src/slic3r/GUI/GUI_ObjectList.cpp:687
-#: src/libslic3r/PrintConfig.cpp:532 src/libslic3r/PrintConfig.cpp:641
-#: src/libslic3r/PrintConfig.cpp:982 src/libslic3r/PrintConfig.cpp:1243
-#: src/libslic3r/PrintConfig.cpp:1716 src/libslic3r/PrintConfig.cpp:2046
-#: src/libslic3r/PrintConfig.cpp:2263 src/libslic3r/PrintConfig.cpp:2423
-msgid "Extrusion Width"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:100 src/slic3r/GUI/GUI_ObjectList.cpp:689
-#: src/slic3r/GUI/Tab.cpp:1472 src/libslic3r/PrintConfig.cpp:301
-#: src/libslic3r/PrintConfig.cpp:310 src/libslic3r/PrintConfig.cpp:326
-msgid "Skirt and brim"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:102 src/slic3r/GUI/GUI_ObjectList.cpp:691
-#: src/slic3r/GUI/Tab.cpp:1428 src/slic3r/GUI/Tab.cpp:1464
-#: src/slic3r/GUI/Tab.cpp:1569 src/slic3r/GUI/Tab.cpp:1572
-#: src/slic3r/GUI/Tab.cpp:1869 src/slic3r/GUI/Tab.cpp:2211
-#: src/slic3r/GUI/Tab.cpp:4132 src/libslic3r/PrintConfig.cpp:92
-#: src/libslic3r/PrintConfig.cpp:132 src/libslic3r/PrintConfig.cpp:279
-#: src/libslic3r/PrintConfig.cpp:1186 src/libslic3r/PrintConfig.cpp:1270
-#: src/libslic3r/PrintConfig.cpp:2593 src/libslic3r/PrintConfig.cpp:2765
-msgid "Advanced"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:104 src/slic3r/GUI/GUI_ObjectList.cpp:693
-#: src/slic3r/GUI/Plater.cpp:357 src/slic3r/GUI/Tab.cpp:4066
-#: src/slic3r/GUI/Tab.cpp:4067 src/libslic3r/PrintConfig.cpp:2931
-#: src/libslic3r/PrintConfig.cpp:2938 src/libslic3r/PrintConfig.cpp:2947
-#: src/libslic3r/PrintConfig.cpp:2956 src/libslic3r/PrintConfig.cpp:2966
-#: src/libslic3r/PrintConfig.cpp:2976 src/libslic3r/PrintConfig.cpp:3013
-#: src/libslic3r/PrintConfig.cpp:3020 src/libslic3r/PrintConfig.cpp:3031
-#: src/libslic3r/PrintConfig.cpp:3041 src/libslic3r/PrintConfig.cpp:3050
-#: src/libslic3r/PrintConfig.cpp:3063 src/libslic3r/PrintConfig.cpp:3073
-#: src/libslic3r/PrintConfig.cpp:3082 src/libslic3r/PrintConfig.cpp:3092
-#: src/libslic3r/PrintConfig.cpp:3103 src/libslic3r/PrintConfig.cpp:3111
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:105 src/slic3r/GUI/GUI_ObjectList.cpp:694
-#: src/slic3r/GUI/Plater.cpp:500 src/slic3r/GUI/Tab.cpp:4107
-#: src/slic3r/GUI/Tab.cpp:4108 src/slic3r/GUI/Tab.cpp:4179
-#: src/libslic3r/PrintConfig.cpp:3119 src/libslic3r/PrintConfig.cpp:3126
-#: src/libslic3r/PrintConfig.cpp:3140 src/libslic3r/PrintConfig.cpp:3151
-#: src/libslic3r/PrintConfig.cpp:3161 src/libslic3r/PrintConfig.cpp:3183
-#: src/libslic3r/PrintConfig.cpp:3194 src/libslic3r/PrintConfig.cpp:3201
-#: src/libslic3r/PrintConfig.cpp:3208 src/libslic3r/PrintConfig.cpp:3219
-#: src/libslic3r/PrintConfig.cpp:3228 src/libslic3r/PrintConfig.cpp:3237
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:106 src/slic3r/GUI/Tab.cpp:4125
-#: src/slic3r/GUI/Tab.cpp:4126 src/libslic3r/SLA/Hollowing.cpp:45
-#: src/libslic3r/SLA/Hollowing.cpp:57 src/libslic3r/SLA/Hollowing.cpp:66
-#: src/libslic3r/SLA/Hollowing.cpp:75 src/libslic3r/PrintConfig.cpp:3247
-#: src/libslic3r/PrintConfig.cpp:3254 src/libslic3r/PrintConfig.cpp:3264
-#: src/libslic3r/PrintConfig.cpp:3273
-msgid "Hollowing"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:314
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:142
+#: src/slic3r/GUI/GUI_ObjectList.cpp:297
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:140
 msgid "Name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:330 src/slic3r/GUI/GUI_ObjectList.cpp:471
+#: src/slic3r/GUI/GUI_ObjectList.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:465
 msgid "Editing"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:416 src/slic3r/GUI/Plater.cpp:1074
+#: src/slic3r/GUI/GUI_ObjectList.cpp:396
+msgid "No errors detected"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:405
 #, possible-c-format
 msgid "Auto-repaired %1$d error"
 msgid_plural "Auto-repaired %1$d errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:423 src/slic3r/GUI/Plater.cpp:1079
+#: src/slic3r/GUI/GUI_ObjectList.cpp:409
 #, possible-c-format
 msgid "%1$d degenerate facet"
 msgid_plural "%1$d degenerate facets"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:425 src/slic3r/GUI/Plater.cpp:1081
+#: src/slic3r/GUI/GUI_ObjectList.cpp:411
 #, possible-c-format
 msgid "%1$d edge fixed"
 msgid_plural "%1$d edges fixed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:427 src/slic3r/GUI/Plater.cpp:1083
+#: src/slic3r/GUI/GUI_ObjectList.cpp:413
 #, possible-c-format
 msgid "%1$d facet removed"
 msgid_plural "%1$d facets removed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:429 src/slic3r/GUI/Plater.cpp:1085
-#, possible-c-format
-msgid "%1$d facet added"
-msgid_plural "%1$d facets added"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:431 src/slic3r/GUI/Plater.cpp:1087
+#: src/slic3r/GUI/GUI_ObjectList.cpp:415
 #, possible-c-format
 msgid "%1$d facet reversed"
 msgid_plural "%1$d facets reversed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:433 src/slic3r/GUI/Plater.cpp:1089
+#: src/slic3r/GUI/GUI_ObjectList.cpp:417
 #, possible-c-format
 msgid "%1$d backwards edge"
 msgid_plural "%1$d backwards edges"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:436
+#: src/slic3r/GUI/GUI_ObjectList.cpp:420
+#, possible-c-format
+msgid "Remaining %1$d open edge"
+msgid_plural "Remaining %1$d open edges"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:422
+msgid "Remaning errors"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:423
+#, possible-c-format
+msgid "%1$d open edge"
+msgid_plural "%1$d open edges"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:430
 msgid "Right button click the icon to fix STL through Netfabb"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:473
+#: src/slic3r/GUI/GUI_ObjectList.cpp:467
 msgid "Right button click the icon to change the object settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:475
+#: src/slic3r/GUI/GUI_ObjectList.cpp:469
 msgid "Click the icon to change the object settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:479
+#: src/slic3r/GUI/GUI_ObjectList.cpp:473
 msgid "Right button click the icon to change the object printable property"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:481
+#: src/slic3r/GUI/GUI_ObjectList.cpp:475
 msgid "Click the icon to change the object printable property"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:604
+#: src/slic3r/GUI/GUI_ObjectList.cpp:598
 msgid "Change Extruder"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:619
+#: src/slic3r/GUI/GUI_ObjectList.cpp:613
 msgid "Rename Object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:619
+#: src/slic3r/GUI/GUI_ObjectList.cpp:613
 msgid "Rename Sub-object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1265
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4406
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1231
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3987
 msgid "Instances to Separated Objects"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1237
 msgid "Volumes in Object reordered"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1237
 msgid "Object reordered"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1356
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1717
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2099
-#, possible-c-format
-msgid "Quick Add Settings (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1446
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1495
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1287
 msgid "Add Settings for Layers"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1496
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1288
 msgid "Add Settings for Sub-object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1497
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1289
 msgid "Add Settings for Object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1567
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1328
 msgid "Add Settings Bundle for Height range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1568
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1329
 msgid "Add Settings Bundle for Sub-object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1569
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1330
 msgid "Add Settings Bundle for Object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1608
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1613
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1645
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1649
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1613
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1613
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1681
-msgid "Height range Modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1690
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1768
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1778
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1790
-msgid "Set as a Separated Object"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1790
-msgid "Set as a Separated Objects"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1800
-msgid "Printable"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1815
-msgid "Rename"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1826
-msgid "Fix through the Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1836 src/slic3r/GUI/Plater.cpp:4056
-msgid "Export as STL"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1843
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4601 src/slic3r/GUI/Plater.cpp:4022
-msgid "Reload the selected volumes from disk"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1850
-msgid "Set extruder for selected items"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1882 src/libslic3r/PrintConfig.cpp:416
-msgid "Default"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1902
-msgid "Scale to print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1902
-msgid "Scale the selected object to fit the print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1931 src/slic3r/GUI/Plater.cpp:5247
-msgid "Convert from imperial units"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1933 src/slic3r/GUI/Plater.cpp:5247
-msgid "Revert conversion from imperial units"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1962
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1970
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2650 src/libslic3r/PrintConfig.cpp:3811
-msgid "Merge"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1962
-msgid "Merge objects to the one multipart object"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1970
-msgid "Merge objects to the one single object"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2044
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2301
-msgid "Add Shape"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2129
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1399
 msgid "Load Part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2168
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1399
+msgid "Load Modifier"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1437
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1496 src/slic3r/GUI/Plater.cpp:2251
+msgid "Loading"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1444
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1527 src/slic3r/GUI/Plater.cpp:2268
+msgid "Loading file"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1452
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1535
 msgid "Error!"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1619
 msgid "Add Generic Subobject"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2272
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1644
 msgid "Generic"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2398
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1708
+msgid "Add Shape from Gallery"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1708
+msgid "Add Shapes from Gallery"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1816
+msgid "Remove paint-on supports"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1823
+msgid "Remove paint-on seam"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1830
+msgid "Remove Multi Material painting"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1836
+msgid "Shift objects to bed"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1842
+msgid "Remove variable layer height"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1863
 msgid "Delete Settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2422
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1887
 msgid "Delete All Instances from Object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2438
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1903
 msgid "Delete Height Range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2470
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1935
 msgid "From Object List You can't delete the last solid part from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2474
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1939
 msgid "Delete Subobject"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2489
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1962
 msgid "Last instance of an object cannot be deleted."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2493
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1966
 msgid "Delete Instance"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2517 src/slic3r/GUI/Plater.cpp:2879
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1990
 msgid ""
 "The selected object couldn't be split because it contains only one part."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2521
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1994
 msgid "Split to Parts"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2657
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2130
 msgid "Merged"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2741
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2215
 msgid "Merge all parts to the one single object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2773
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2247
 msgid "Add Layers"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2927
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2416
 msgid "Group manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2939
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2431
 msgid "Object manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2952
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2464
 msgid "Object Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2956
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2468
 msgid "Part Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2961
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2473
 msgid "Layer range Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2967
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2479
 msgid "Part manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2973
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2485
 msgid "Instance manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2980
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2492
 msgid "Height ranges"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:2980
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2492
 msgid "Settings for height range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3166
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2728
 msgid "Delete Selected Item"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3354
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2924
 msgid "Delete Selected"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3430
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3458
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3478
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3000
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3028
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3048
 msgid "Add Height Range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3524
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3094
 msgid ""
 "Cannot insert a new layer range after the current layer range.\n"
 "The next layer range is too thin to be split to two\n"
 "without violating the minimum layer height."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3528
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3098
 msgid ""
 "Cannot insert a new layer range between the current and the next layer "
 "range.\n"
@@ -3323,212 +4007,257 @@ msgid ""
 "is thinner than the minimum layer height allowed."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3533
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3103
 msgid ""
 "Cannot insert a new layer range after the current layer range.\n"
 "Current layer range overlaps with the next layer range."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3592
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3162
 msgid "Edit Height Range"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3899
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3481
 msgid "Selection-Remove from list"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:3907
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3493
 msgid "Selection-Add from list"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4042
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3630
 msgid "Object or Instance"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4043
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4176
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3631
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3770
 msgid "Part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4043
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3631
 msgid "Layer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4045
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3633
 msgid "Unsupported selection"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4046
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3634
 #, possible-c-format
 msgid "You started your selection with %s Item."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4047
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3635
 #, possible-c-format
 msgid "In this mode you can select only other %s Items%s"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4050
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3638
 msgid "of a current Object"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4055
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4130 src/slic3r/GUI/Plater.cpp:143
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3643
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3718 src/slic3r/GUI/Plater.cpp:151
 msgid "Info"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4171
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3765
 msgid "You can't change a type of the last solid part of the object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4176
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3770
+msgid "Negative Volume"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3770
 msgid "Modifier"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4176
-msgid "Support Enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4176
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3770
 msgid "Support Blocker"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4178
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3770
+msgid "Support Enforcer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3771
 msgid "Select type of part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4183
+#: src/slic3r/GUI/GUI_ObjectList.cpp:3776
 msgid "Change Part Type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4428
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4009
 msgid "Enter new name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4428
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4009
 msgid "Renaming"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4444
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4571
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4025
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4256
 #: src/slic3r/GUI/SavePresetDialog.cpp:101
 #: src/slic3r/GUI/SavePresetDialog.cpp:109
 msgid "The supplied name is not valid;"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4445
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4572
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4026
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4257
 #: src/slic3r/GUI/SavePresetDialog.cpp:102
 msgid "the following characters are not allowed:"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4620
-msgid "Select extruder number:"
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4082
+msgid "Repairing model"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4621
-msgid "This extruder will be set for selected items"
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4111
+msgid "Fix through NetFabb"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4646
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4114
+msgid "Fixing through NetFabb"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4145
+msgid "Folowing model is repaired successfully"
+msgid_plural "Folowing models are repaired successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4151
+msgid "Folowing model repair failed"
+msgid_plural "Folowing models repair failed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4156
+msgid "Repairing was canceled"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4159
+msgid "Model Repair by the Netfabb service"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4279
 msgid "Change Extruders"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4743 src/slic3r/GUI/Selection.cpp:1485
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4419
+msgid "Set Printable group"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4419
+msgid "Set Unprintable group"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4421
 msgid "Set Printable"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:4743 src/slic3r/GUI/Selection.cpp:1485
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4421
 msgid "Set Unprintable"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:68
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:96
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4422
+msgid "Set Printable Instance"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:4422
+msgid "Set Unprintable Instance"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:56
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:85
 msgid "World coordinates"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:69
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:97
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:57
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:86
 msgid "Local coordinates"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:73
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:61
 msgid "Select coordinate space, in which the transformation will be performed."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:144 src/libslic3r/GCode.cpp:537
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:142 src/libslic3r/GCode.cpp:522
 msgid "Object name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:486
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:202
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:522
 msgid "Position"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:487
-#: src/slic3r/GUI/Mouse3DController.cpp:486
-#: src/slic3r/GUI/Mouse3DController.cpp:507
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:203
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:523
+#: src/slic3r/GUI/Mouse3DController.cpp:478
+#: src/slic3r/GUI/Mouse3DController.cpp:499
 msgid "Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:251
 #, possible-c-format
 msgid "Toggle %c axis mirroring"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:286
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:285
 msgid "Set Mirror"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:326
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:338
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:325
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:337
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:349
 msgid "Drop to bed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:353
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:364
 msgid "Reset rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:375
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:386
 msgid "Reset Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:388
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:390
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:399
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:401
 msgid "Reset scale"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:404
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:415
 msgid "Inches"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:488
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:524
 msgid "Scale factors"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:542
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:578
 msgid "Translate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:606
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:642
 msgid ""
 "You cannot use non-uniform scaling mode for multiple objects/parts selection"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:778
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:819
 msgid "Set Position"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:809
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:850
 msgid "Set Orientation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:874
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:915
 msgid "Set Scale"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:906
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:948
 msgid ""
 "The currently manipulated object is tilted (rotation angles are not "
 "multiples of 90°).\n"
@@ -3537,1680 +4266,1870 @@ msgid ""
 "once the rotation is embedded into the object coordinates."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:909
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:951
 msgid ""
 "This operation is irreversible.\n"
 "Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectSettings.cpp:62
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:63
 msgid "Additional Settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectSettings.cpp:98
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:99
 msgid "Remove parameter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectSettings.cpp:104
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:105
 #, possible-c-format
 msgid "Delete Option %s"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectSettings.cpp:157
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:158
 #, possible-c-format
 msgid "Change Option %s"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:209
+#: src/slic3r/GUI/GUI_Preview.cpp:210
 msgid "View"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:212 src/libslic3r/PrintConfig.cpp:585
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/libslic3r/PrintConfig.cpp:770
 msgid "Height"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:2555
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/libslic3r/PrintConfig.cpp:2927
 msgid "Width"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:215 src/slic3r/GUI/Tab.cpp:1854
+#: src/slic3r/GUI/GUI_Preview.cpp:220 src/slic3r/GUI/Tab.cpp:1940
 msgid "Fan speed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:216
+#: src/slic3r/GUI/GUI_Preview.cpp:221 src/slic3r/GUI/Tab.cpp:1915
+msgid "Temperature"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:222
 msgid "Volumetric flow rate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:221
+#: src/slic3r/GUI/GUI_Preview.cpp:227
 msgid "Show"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:242
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/GUI_Preview.cpp:253
 msgid "Feature types"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/ExtrusionEntity.cpp:310
-#: src/libslic3r/ExtrusionEntity.cpp:332
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:312
+#: src/libslic3r/ExtrusionEntity.cpp:334
 msgid "Perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/ExtrusionEntity.cpp:311
-#: src/libslic3r/ExtrusionEntity.cpp:334
+#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/ExtrusionEntity.cpp:313
+#: src/libslic3r/ExtrusionEntity.cpp:336
 msgid "External perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/ExtrusionEntity.cpp:312
-#: src/libslic3r/ExtrusionEntity.cpp:336
+#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/ExtrusionEntity.cpp:314
+#: src/libslic3r/ExtrusionEntity.cpp:338
 msgid "Overhang perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/ExtrusionEntity.cpp:313
-#: src/libslic3r/ExtrusionEntity.cpp:338
+#: src/slic3r/GUI/GUI_Preview.cpp:241 src/libslic3r/ExtrusionEntity.cpp:315
+#: src/libslic3r/ExtrusionEntity.cpp:340
 msgid "Internal infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/ExtrusionEntity.cpp:314
-#: src/libslic3r/ExtrusionEntity.cpp:340 src/libslic3r/PrintConfig.cpp:2045
-#: src/libslic3r/PrintConfig.cpp:2056
+#: src/slic3r/GUI/GUI_Preview.cpp:242 src/libslic3r/ExtrusionEntity.cpp:316
+#: src/libslic3r/ExtrusionEntity.cpp:342 src/libslic3r/PrintConfig.cpp:2294
+#: src/libslic3r/PrintConfig.cpp:2305
 msgid "Solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/ExtrusionEntity.cpp:315
-#: src/libslic3r/ExtrusionEntity.cpp:342 src/libslic3r/PrintConfig.cpp:2422
-#: src/libslic3r/PrintConfig.cpp:2434
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/ExtrusionEntity.cpp:317
+#: src/libslic3r/ExtrusionEntity.cpp:344 src/libslic3r/PrintConfig.cpp:2785
+#: src/libslic3r/PrintConfig.cpp:2797
 msgid "Top solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/ExtrusionEntity.cpp:317
-#: src/libslic3r/ExtrusionEntity.cpp:346
+#: src/slic3r/GUI/GUI_Preview.cpp:245 src/libslic3r/ExtrusionEntity.cpp:319
+#: src/libslic3r/ExtrusionEntity.cpp:348
 msgid "Bridge infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:235 src/libslic3r/ExtrusionEntity.cpp:318
-#: src/libslic3r/ExtrusionEntity.cpp:348 src/libslic3r/PrintConfig.cpp:1100
+#: src/slic3r/GUI/GUI_Preview.cpp:246 src/libslic3r/ExtrusionEntity.cpp:320
+#: src/libslic3r/ExtrusionEntity.cpp:350 src/libslic3r/PrintConfig.cpp:1278
 msgid "Gap fill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1474
-#: src/libslic3r/ExtrusionEntity.cpp:319 src/libslic3r/ExtrusionEntity.cpp:350
-msgid "Skirt"
+#: src/slic3r/GUI/GUI_Preview.cpp:247 src/libslic3r/ExtrusionEntity.cpp:321
+#: src/libslic3r/ExtrusionEntity.cpp:352
+msgid "Skirt/Brim"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/libslic3r/ExtrusionEntity.cpp:321
-#: src/libslic3r/ExtrusionEntity.cpp:354 src/libslic3r/PrintConfig.cpp:2307
+#: src/slic3r/GUI/GUI_Preview.cpp:249 src/libslic3r/ExtrusionEntity.cpp:323
+#: src/libslic3r/ExtrusionEntity.cpp:356 src/libslic3r/PrintConfig.cpp:2633
 msgid "Support material interface"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/slic3r/GUI/Tab.cpp:1559
-#: src/libslic3r/ExtrusionEntity.cpp:322 src/libslic3r/ExtrusionEntity.cpp:356
+#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/Tab.cpp:1616
+#: src/libslic3r/ExtrusionEntity.cpp:324 src/libslic3r/ExtrusionEntity.cpp:358
 msgid "Wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:1034
+#: src/slic3r/GUI/GUI_Preview.cpp:731
+msgid "NOTE:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:731
+msgid "Sliced object looks like the sign"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:732
+msgid "Apply auto color change to print"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:1058
 msgid "Shells"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:1035
+#: src/slic3r/GUI/GUI_Preview.cpp:1059
 msgid "Tool marker"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:1036
+#: src/slic3r/GUI/GUI_Preview.cpp:1060
 msgid "Legend/Estimated printing time"
 msgstr ""
 
-#: src/slic3r/GUI/ImGuiWrapper.cpp:804 src/slic3r/GUI/Search.cpp:386
+#: src/slic3r/GUI/HintNotification.cpp:762
+#: src/slic3r/GUI/HintNotification.cpp:788
+#: src/slic3r/GUI/NotificationManager.cpp:399
+#: src/slic3r/GUI/NotificationManager.cpp:416
+msgid "More"
+msgstr ""
+
+#: src/slic3r/GUI/HintNotification.cpp:903
+msgid "Open Preferences."
+msgstr ""
+
+#: src/slic3r/GUI/HintNotification.cpp:995
+msgid "Open Documentation in web browser."
+msgstr ""
+
+#: src/slic3r/GUI/ImGuiWrapper.cpp:848 src/slic3r/GUI/Search.cpp:467
 msgid "Use for search"
 msgstr ""
 
-#: src/slic3r/GUI/ImGuiWrapper.cpp:805 src/slic3r/GUI/Search.cpp:380
+#: src/slic3r/GUI/ImGuiWrapper.cpp:849 src/slic3r/GUI/Search.cpp:460
 msgid "Category"
 msgstr ""
 
-#: src/slic3r/GUI/ImGuiWrapper.cpp:807 src/slic3r/GUI/Search.cpp:382
+#: src/slic3r/GUI/ImGuiWrapper.cpp:851 src/slic3r/GUI/Search.cpp:462
 msgid "Search in English"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:153
+#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:170
 msgid "Could not arrange model objects! Some geometries may be invalid."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:162
+#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:179
 msgid "Arranging"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:191
+#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:203
 msgid "Arranging canceled."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:192
+#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:204
 msgid "Arranging done."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/Job.cpp:89
+#: src/slic3r/GUI/Jobs/ArrangeJob.cpp:249
+#, possible-c-format
+msgid ""
+"Arrangement ignored the following objects which can't fit into a single "
+"bed:\n"
+"%s"
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/FillBedJob.cpp:123
+msgid "Filling bed"
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/FillBedJob.cpp:134
+msgid "Bed filling canceled."
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/FillBedJob.cpp:135
+msgid "Bed filling done."
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/Job.cpp:108
 msgid "ERROR: not enough resources to execute a new job."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:41
+#: src/slic3r/GUI/Jobs/PlaterJob.cpp:13
+msgid "An unexpected error occured: "
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:59
 msgid "Searching for optimal orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:73
+#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:77
 msgid "Orientation search canceled."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:74
+#: src/slic3r/GUI/Jobs/RotoptimizeJob.cpp:78
 msgid "Orientation found."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:35
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:36
 msgid "Choose SLA archive:"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:39
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:40
 msgid "Import file"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:46
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:47
 msgid "Import model and profile"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:47
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:48
 msgid "Import profile only"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:48
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:49
 msgid "Import model only"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:59
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:60
 msgid "Accurate"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:60
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:61
 msgid "Balanced"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:61
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:62
 msgid "Quick"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:135
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:138
 msgid "Importing SLA archive"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:159
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:156
+msgid ""
+"The SLA archive doesn't contain any presets. Please activate some SLA "
+"printer preset first before importing that SLA archive."
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:162
 msgid "Importing canceled."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:160
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:163
 msgid "Importing done."
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:208 src/slic3r/GUI/Plater.cpp:2365
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:210
+msgid ""
+"The imported SLA archive did not contain any presets. The current SLA "
+"presets were used as fallback."
+msgstr ""
+
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:223 src/slic3r/GUI/Plater.cpp:2295
 msgid "You cannot load SLA project with a multi-part object on the bed"
 msgstr ""
 
-#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:209 src/slic3r/GUI/Plater.cpp:2366
-#: src/slic3r/GUI/Tab.cpp:3257
-msgid "Please check your object list before preset changing."
+#: src/slic3r/GUI/Jobs/SLAImportJob.cpp:225 src/slic3r/GUI/Plater.cpp:2297
+msgid "Attention!"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:17 src/slic3r/GUI/MainFrame.cpp:894
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:18 src/slic3r/GUI/MainFrame.cpp:1106
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:69
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:77
 msgid "New project, clear plater"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:70
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
 msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:71
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:79
 msgid "Save project (3mf)"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:72
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:80
 msgid "Save project as (3mf)"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:73
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:81
 msgid "(Re)slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:75
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
 msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:76
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:84
 msgid "Import Config from ini/amf/3mf/gcode"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:77
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:85
 msgid "Load Config from ini/amf/3mf/gcode and merge"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:79 src/slic3r/GUI/Plater.cpp:767
-#: src/slic3r/GUI/Plater.cpp:6081 src/libslic3r/PrintConfig.cpp:3716
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:87 src/slic3r/GUI/Plater.cpp:826
+#: src/slic3r/GUI/Plater.cpp:6415 src/libslic3r/PrintConfig.cpp:4110
 msgid "Export G-code"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:80 src/slic3r/GUI/Plater.cpp:6082
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:88 src/slic3r/GUI/Plater.cpp:6416
 msgid "Send G-code"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:81
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:89
 msgid "Export config"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:82 src/slic3r/GUI/Plater.cpp:755
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:90 src/slic3r/GUI/Plater.cpp:809
 msgid "Export to SD card / Flash drive"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:91
 msgid "Eject SD card / Flash drive"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:85
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:93
 msgid "Select all objects"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:86
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:94
 msgid "Deselect all"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:87
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:95
 msgid "Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:91
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:99
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:92
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:100
 msgid "Paste from clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:94
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:96
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:104
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:209
 msgid "Reload plater from disk"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:100
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
 msgid "Select Plater Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
 msgid "Select Print Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
 msgid "Select Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
 msgid "Select Printer Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
 msgid "Switch to 3D"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
 msgid "Switch to Preview"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+#: src/slic3r/GUI/PrintHostDialogs.cpp:200
 msgid "Print host upload queue"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107 src/slic3r/GUI/MainFrame.cpp:65
-#: src/slic3r/GUI/MainFrame.cpp:1191
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115 src/slic3r/GUI/MainFrame.cpp:75
+#: src/slic3r/GUI/MainFrame.cpp:1419
 msgid "Open new instance"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
 msgid "Camera view"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
 msgid "Show/Hide object/instance labels"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112 src/slic3r/GUI/Preferences.cpp:13
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:123 src/slic3r/GUI/Preferences.cpp:16
 msgid "Preferences"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
 msgid "Show keyboard shortcuts list"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:191
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:213
 msgid "Commands"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
 msgid "Add Instance of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
 msgid "Remove Instance of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
 msgid ""
 "Press to select multiple objects\n"
 "or move multiple objects with mouse"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:125
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
 msgid "Press to activate selection rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
 msgid "Press to activate deselection rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:196
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:207
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:226
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:243
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:233
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:248
 msgid "Arrow Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
 msgid "Move selection 10 mm in positive Y direction"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:197
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:208
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:220
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:227
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:244
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:234
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:249
 msgid "Arrow Down"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:128
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
 msgid "Move selection 10 mm in negative Y direction"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:198
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:221
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:228
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:241
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:219
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:235
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:246
 msgid "Arrow Left"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
 msgid "Move selection 10 mm in negative X direction"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:199
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:222
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:229
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:242
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:220
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:236
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:247
 msgid "Arrow Right"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
 msgid "Move selection 10 mm in positive X direction"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
 msgid "Any arrow"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
 msgid "Movement step set to 1 mm"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
 msgid "Movement in camera space"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
 msgid "Page Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
 msgid "Rotate selection 45 degrees CCW"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
 msgid "Page Down"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
 msgid "Rotate selection 45 degrees CW"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
 msgid "Gizmo move"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
 msgid "Gizmo scale"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
 msgid "Gizmo rotate"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:150
 msgid "Gizmo cut"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
 msgid "Gizmo Place face on bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:152
 msgid "Gizmo SLA hollow"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:153
 msgid "Gizmo SLA support points"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
+msgid "Gizmo FDM paint-on supports"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+msgid "Gizmo FDM paint-on seam"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+msgid "Gizmo Multi Material painting"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:157
 msgid "Unselect gizmo or clear selection"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
 msgid "Change camera type (perspective, orthographic)"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:159
 msgid "Zoom to Bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:160
 msgid ""
 "Zoom to selected object\n"
 "or all objects in scene, if none selected"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:161
 msgid "Zoom in"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:162
 msgid "Zoom out"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:163
 msgid "Switch between Editor/Preview"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
 msgid "Collapse/Expand the sidebar"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:152
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
 msgid "Show/Hide 3Dconnexion devices settings dialog, if enabled"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
 msgid "Show/Hide 3Dconnexion devices settings dialog"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:167 src/slic3r/GUI/MainFrame.cpp:331
-#: src/slic3r/GUI/MainFrame.cpp:343
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+msgid "Minimize application"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:181 src/slic3r/GUI/MainFrame.cpp:284
+#: src/slic3r/GUI/MainFrame.cpp:328 src/slic3r/GUI/MainFrame.cpp:440
+#: src/slic3r/GUI/MainFrame.cpp:443 src/slic3r/GUI/MainFrame.cpp:465
+#: src/slic3r/GUI/MainFrame.cpp:468
 msgid "Plater"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:170
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
 msgid "All gizmos: Rotate - left mouse button; Pan - right mouse button"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
 msgid "Gizmo move: Press to snap by 1mm"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:186
 msgid "Gizmo scale: Press to snap by 5%"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
 msgid "Gizmo scale: Scale selection to fit print volume"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:188
 msgid "Gizmo scale: Press to activate one direction scaling"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:189
 msgid "Gizmo scale: Press to scale selected objects around their own center"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:190
 msgid "Gizmo rotate: Press to rotate selected objects around their own center"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:193
 msgid "Gizmos"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:193
 msgid ""
 "The following shortcuts are applicable when the specified gizmo is active"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:183 src/slic3r/GUI/MainFrame.cpp:1244
-msgid "Open a G-code file"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:185 src/slic3r/GUI/MainFrame.cpp:1142
-#: src/slic3r/GUI/MainFrame.cpp:1146 src/slic3r/GUI/MainFrame.cpp:1249
-#: src/slic3r/GUI/MainFrame.cpp:1253
-msgid "Reload the plater from disk"
-msgstr ""
-
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:196
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:200
-msgid "Vertical slider - Move active thumb Up"
+msgid "Set selected items as Ptrintable/Unprintable"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:197
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:201
-msgid "Vertical slider - Move active thumb Down"
+msgid "Set default extruder for the selected items"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:198
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:202
-msgid "Horizontal slider - Move active thumb Left"
+msgid "Set extruder number for the selected items"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:199
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:203
-msgid "Horizontal slider - Move active thumb Right"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:201
+msgid "Objects List"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:204
-msgid "On/Off one layer mode of the vertical slider"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:205 src/slic3r/GUI/MainFrame.cpp:1524
+msgid "Open a G-code file"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:205
-msgid "Show/Hide Legend and Estimated printing time"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:207 src/slic3r/GUI/MainFrame.cpp:1358
+#: src/slic3r/GUI/MainFrame.cpp:1362 src/slic3r/GUI/MainFrame.cpp:1529
+#: src/slic3r/GUI/MainFrame.cpp:1533
+msgid "Reload the plater from disk"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:207
-msgid "Upper layer"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:217
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:221
+msgid "Vertical slider - Move active thumb Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:208
-msgid "Lower layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:209
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:210
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:211
-msgid "Show/Hide Legend & Estimated printing time"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:215 src/slic3r/GUI/Plater.cpp:4221
-#: src/slic3r/GUI/Tab.cpp:2616
-msgid "Preview"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:218
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:222
+msgid "Vertical slider - Move active thumb Down"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:219
-msgid "Move active thumb Up"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:223
+msgid "Horizontal slider - Move active thumb Left"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:220
-msgid "Move active thumb Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:221
-msgid "Set upper thumb as active"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:222
-msgid "Set lower thumb as active"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:223
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:230
-msgid "Add color change marker for current layer"
-msgstr ""
-
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:224
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:231
-msgid "Delete color change marker for current layer"
+msgid "Horizontal slider - Move active thumb Right"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:225
+msgid "On/Off one layer mode of the vertical slider"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:226
-msgid "Move current slider thumb Up"
+msgid "Show/Hide Legend and Estimated printing time"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:227
-msgid "Move current slider thumb Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:228
-msgid "Set upper thumb to current slider thumb"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:229
-msgid "Set lower thumb to current slider thumb"
+msgid "Show/Hide G-code window"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:233
+msgid "Move active thumb Up"
+msgstr ""
+
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:234
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:249
+msgid "Move active thumb Down"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:235
+msgid "Set upper thumb as active"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:236
+msgid "Set lower thumb as active"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:237
+msgid "Add color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:238
+msgid "Delete color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:239
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:240
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:250
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:251
 msgid ""
 "Press to speed up 5 times while moving thumb\n"
 "with arrow keys or mouse wheel"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:237
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:243
 msgid "Vertical Slider"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:237
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:243
 msgid ""
 "The following shortcuts are applicable in G-code preview when the vertical "
 "slider is active"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:241
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:246
 msgid "Move active thumb Left"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:242
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:247
 msgid "Move active thumb Right"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:243
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:248
 msgid "Set left thumb as active"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:244
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:249
 msgid "Set right thumb as active"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:246
-msgid "Move active slider thumb Left"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:247
-msgid "Move active slider thumb Right"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:253
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:254
 msgid "Horizontal Slider"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:253
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:254
 msgid ""
 "The following shortcuts are applicable in G-code preview when the horizontal "
 "slider is active"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:276
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:278
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:65 src/slic3r/GUI/MainFrame.cpp:79
-#: src/slic3r/GUI/MainFrame.cpp:1191
+#: src/slic3r/GUI/MainFrame.cpp:75 src/slic3r/GUI/MainFrame.cpp:89
+#: src/slic3r/GUI/MainFrame.cpp:1419
 msgid "Open a new PrusaSlicer instance"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:81
+#: src/slic3r/GUI/MainFrame.cpp:78 src/slic3r/GUI/MainFrame.cpp:91
 msgid "G-code preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:68 src/slic3r/GUI/MainFrame.cpp:1091
+#: src/slic3r/GUI/MainFrame.cpp:78 src/slic3r/GUI/MainFrame.cpp:1307
 msgid "Open G-code viewer"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:79 src/slic3r/GUI/MainFrame.cpp:1260
+#: src/slic3r/GUI/MainFrame.cpp:89 src/slic3r/GUI/MainFrame.cpp:1540
 msgid "Open PrusaSlicer"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:81
+#: src/slic3r/GUI/MainFrame.cpp:91
 msgid "Open new G-code viewer"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:153
-msgid ""
-"Remember to check for updates at https://github.com/prusa3d/PrusaSlicer/"
-"releases"
+#: src/slic3r/GUI/MainFrame.cpp:225
+msgid "Closing PrusaSlicer. Current project is modified."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:510
+#: src/slic3r/GUI/MainFrame.cpp:232
+msgid "PrusaSlicer is closing"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:232
+msgid "Closing PrusaSlicer while some presets are modified."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:285 src/slic3r/GUI/MainFrame.cpp:330
+#: src/slic3r/GUI/Tab.hpp:376 src/slic3r/GUI/Tab.hpp:493
+msgid "Print Settings"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:286 src/slic3r/GUI/MainFrame.cpp:334
+#: src/slic3r/GUI/MainFrame.cpp:2102 src/slic3r/GUI/MainFrame.cpp:2103
+#: src/slic3r/GUI/Tab.hpp:478
+msgid "Material Settings"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:286 src/slic3r/GUI/MainFrame.cpp:332
+#: src/slic3r/GUI/MainFrame.cpp:2102 src/slic3r/GUI/MainFrame.cpp:2103
+#: src/slic3r/GUI/Tab.hpp:405
+msgid "Filament Settings"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:287 src/slic3r/GUI/MainFrame.cpp:336
+#: src/slic3r/GUI/Tab.hpp:446
+msgid "Printer Settings"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:627 src/slic3r/GUI/Plater.cpp:1597
+#: src/slic3r/GUI/Plater.cpp:2656
+msgid "Untitled"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:650
 msgid "based on Slic3r"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:866
+#: src/slic3r/GUI/MainFrame.cpp:1076
 msgid "Prusa 3D &Drivers"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:866
+#: src/slic3r/GUI/MainFrame.cpp:1076
 msgid "Open the Prusa3D drivers download page in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:868
+#: src/slic3r/GUI/MainFrame.cpp:1078
 msgid "Software &Releases"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:868
+#: src/slic3r/GUI/MainFrame.cpp:1078
 msgid "Open the software releases page in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:874
+#: src/slic3r/GUI/MainFrame.cpp:1084
 #, possible-c-format
 msgid "%s &Website"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:875
+#: src/slic3r/GUI/MainFrame.cpp:1085
 #, possible-c-format
 msgid "Open the %s website in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:881
+#: src/slic3r/GUI/MainFrame.cpp:1091
 msgid "System &Info"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:881
+#: src/slic3r/GUI/MainFrame.cpp:1091
 msgid "Show system information"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:883
+#: src/slic3r/GUI/MainFrame.cpp:1093
 msgid "Show &Configuration Folder"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:883
+#: src/slic3r/GUI/MainFrame.cpp:1093
 msgid "Show user configuration folder (datadir)"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:885
+#: src/slic3r/GUI/MainFrame.cpp:1095
 msgid "Report an I&ssue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:885
+#: src/slic3r/GUI/MainFrame.cpp:1095
 #, possible-c-format
 msgid "Report an issue on %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891
+#: src/slic3r/GUI/MainFrame.cpp:1098 src/slic3r/GUI/MainFrame.cpp:1101
 #, possible-c-format
 msgid "&About %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:888 src/slic3r/GUI/MainFrame.cpp:891
+#: src/slic3r/GUI/MainFrame.cpp:1098 src/slic3r/GUI/MainFrame.cpp:1101
 msgid "Show about dialog"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:894
+#: src/slic3r/GUI/MainFrame.cpp:1103
+msgid "Show Tip of the day"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1103
+msgid ""
+"Opens Tip of the day notification in bottom right corner or shows another "
+"tip if already opened."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1106
 msgid "Show the list of the keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:908
+#: src/slic3r/GUI/MainFrame.cpp:1120
 msgid "Iso"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:908
+#: src/slic3r/GUI/MainFrame.cpp:1120
 msgid "Iso View"
 msgstr ""
 
 #. TRN To be shown in the main menu View->Top
 #. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:912 src/libslic3r/PrintConfig.cpp:2449
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/slic3r/GUI/MainFrame.cpp:1124 src/libslic3r/PrintConfig.cpp:2812
+#: src/libslic3r/PrintConfig.cpp:2821
 msgid "Top"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:912
+#: src/slic3r/GUI/MainFrame.cpp:1124
 msgid "Top View"
 msgstr ""
 
 #. TRN To be shown in the main menu View->Bottom
 #. TRN To be shown in Print Settings "Bottom solid layers"
 #. TRN To be shown in Print Settings "Top solid layers"
-#: src/slic3r/GUI/MainFrame.cpp:915 src/libslic3r/PrintConfig.cpp:230
-#: src/libslic3r/PrintConfig.cpp:239
+#: src/slic3r/GUI/MainFrame.cpp:1127 src/libslic3r/PrintConfig.cpp:412
+#: src/libslic3r/PrintConfig.cpp:421
 msgid "Bottom"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:915
+#: src/slic3r/GUI/MainFrame.cpp:1127
 msgid "Bottom View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:917
+#: src/slic3r/GUI/MainFrame.cpp:1129
 msgid "Front"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:917
+#: src/slic3r/GUI/MainFrame.cpp:1129
 msgid "Front View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:919 src/libslic3r/PrintConfig.cpp:1934
+#: src/slic3r/GUI/MainFrame.cpp:1131 src/libslic3r/PrintConfig.cpp:2176
 msgid "Rear"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:919
+#: src/slic3r/GUI/MainFrame.cpp:1131
 msgid "Rear View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:921
+#: src/slic3r/GUI/MainFrame.cpp:1133
 msgid "Left"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:921
+#: src/slic3r/GUI/MainFrame.cpp:1133
 msgid "Left View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:923
+#: src/slic3r/GUI/MainFrame.cpp:1135
 msgid "Right"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:923
+#: src/slic3r/GUI/MainFrame.cpp:1135
 msgid "Right View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:936
+#: src/slic3r/GUI/MainFrame.cpp:1148
 msgid "&New Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:936
+#: src/slic3r/GUI/MainFrame.cpp:1148
 msgid "Start a new project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:939
+#: src/slic3r/GUI/MainFrame.cpp:1151
 msgid "&Open Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:939
+#: src/slic3r/GUI/MainFrame.cpp:1151
 msgid "Open a project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:944
+#: src/slic3r/GUI/MainFrame.cpp:1156
 msgid "Recent projects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:953
+#: src/slic3r/GUI/MainFrame.cpp:1168
 msgid ""
 "The selected project is no longer available.\n"
 "Do you want to remove it from the recent projects list?"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:953 src/slic3r/GUI/MainFrame.cpp:1343
-#: src/slic3r/GUI/PrintHostDialogs.cpp:274
+#: src/slic3r/GUI/MainFrame.cpp:1168 src/slic3r/GUI/MainFrame.cpp:1625
+#: src/slic3r/GUI/PrintHostDialogs.cpp:348
 msgid "Error"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:978
+#: src/slic3r/GUI/MainFrame.cpp:1193
 msgid "&Save Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:978
+#: src/slic3r/GUI/MainFrame.cpp:1193
 msgid "Save current project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984
+#: src/slic3r/GUI/MainFrame.cpp:1197 src/slic3r/GUI/MainFrame.cpp:1199
 msgid "Save Project &as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:982 src/slic3r/GUI/MainFrame.cpp:984
+#: src/slic3r/GUI/MainFrame.cpp:1197 src/slic3r/GUI/MainFrame.cpp:1199
 msgid "Save current project file as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:992
+#: src/slic3r/GUI/MainFrame.cpp:1207
 msgid "Import STL/OBJ/AM&F/3MF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:992
+#: src/slic3r/GUI/MainFrame.cpp:1207
 msgid "Load a model"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:996
+#: src/slic3r/GUI/MainFrame.cpp:1211
 msgid "Import STL (imperial units)"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:996
+#: src/slic3r/GUI/MainFrame.cpp:1211
 msgid "Load an model saved with imperial units"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1000
-msgid "Import SL1 archive"
+#: src/slic3r/GUI/MainFrame.cpp:1215
+msgid "Import SL1 / SL1S archive"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1000
-msgid "Load an SL1 archive"
+#: src/slic3r/GUI/MainFrame.cpp:1215
+msgid "Load an SL1 / Sl1S archive"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1005
+#: src/slic3r/GUI/MainFrame.cpp:1220
 msgid "Import &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1005
+#: src/slic3r/GUI/MainFrame.cpp:1220
 msgid "Load exported configuration file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1008
+#: src/slic3r/GUI/MainFrame.cpp:1223
 msgid "Import Config from &project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1008
+#: src/slic3r/GUI/MainFrame.cpp:1223
 msgid "Load configuration from project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1012
+#: src/slic3r/GUI/MainFrame.cpp:1227
 msgid "Import Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1012
+#: src/slic3r/GUI/MainFrame.cpp:1227
 msgid "Load presets from a bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1015
+#: src/slic3r/GUI/MainFrame.cpp:1230
 msgid "&Import"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1018 src/slic3r/GUI/MainFrame.cpp:1305
+#: src/slic3r/GUI/MainFrame.cpp:1233 src/slic3r/GUI/MainFrame.cpp:1585
 msgid "Export &G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1018
+#: src/slic3r/GUI/MainFrame.cpp:1233
 msgid "Export current plate as G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1022 src/slic3r/GUI/MainFrame.cpp:1306
+#: src/slic3r/GUI/MainFrame.cpp:1237 src/slic3r/GUI/MainFrame.cpp:1586
 msgid "S&end G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1022
+#: src/slic3r/GUI/MainFrame.cpp:1237
 msgid "Send to print current plate as G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1026
+#: src/slic3r/GUI/MainFrame.cpp:1241
 msgid "Export G-code to SD card / Flash drive"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1026
+#: src/slic3r/GUI/MainFrame.cpp:1241
 msgid "Export current plate as G-code to SD card / Flash drive"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1030
+#: src/slic3r/GUI/MainFrame.cpp:1245
 msgid "Export plate as &STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1030
+#: src/slic3r/GUI/MainFrame.cpp:1245
 msgid "Export current plate as STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1033
+#: src/slic3r/GUI/MainFrame.cpp:1248
 msgid "Export plate as STL &including supports"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1033
+#: src/slic3r/GUI/MainFrame.cpp:1248
 msgid "Export current plate as STL including supports"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1036
-msgid "Export plate as &AMF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:1036
-msgid "Export current plate as AMF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257
+#: src/slic3r/GUI/MainFrame.cpp:1256 src/slic3r/GUI/MainFrame.cpp:1537
 msgid "Export &toolpaths as OBJ"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1040 src/slic3r/GUI/MainFrame.cpp:1257
+#: src/slic3r/GUI/MainFrame.cpp:1256 src/slic3r/GUI/MainFrame.cpp:1537
 msgid "Export toolpaths as OBJ"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1044
+#: src/slic3r/GUI/MainFrame.cpp:1260
 msgid "Export &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1044
+#: src/slic3r/GUI/MainFrame.cpp:1260
 msgid "Export current configuration to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1047
+#: src/slic3r/GUI/MainFrame.cpp:1263
 msgid "Export Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1047
+#: src/slic3r/GUI/MainFrame.cpp:1263
 msgid "Export all presets to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1050
+#: src/slic3r/GUI/MainFrame.cpp:1266
 msgid "Export Config Bundle With Physical Printers"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1050
+#: src/slic3r/GUI/MainFrame.cpp:1266
 msgid "Export all presets including physical printers to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1053
+#: src/slic3r/GUI/MainFrame.cpp:1269
 msgid "&Export"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1055
+#: src/slic3r/GUI/MainFrame.cpp:1271
 msgid "Ejec&t SD card / Flash drive"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1055
+#: src/slic3r/GUI/MainFrame.cpp:1271
 msgid "Eject SD card / Flash drive after the G-code was exported to it."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1063
+#: src/slic3r/GUI/MainFrame.cpp:1279
 msgid "Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1063
+#: src/slic3r/GUI/MainFrame.cpp:1279
 msgid "Slice a file into a G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1069
+#: src/slic3r/GUI/MainFrame.cpp:1285
 msgid "Quick Slice and Save As"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1069
+#: src/slic3r/GUI/MainFrame.cpp:1285
 msgid "Slice a file into a G-code, save as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1075
+#: src/slic3r/GUI/MainFrame.cpp:1291
 msgid "Repeat Last Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1075
+#: src/slic3r/GUI/MainFrame.cpp:1291
 msgid "Repeat last quick slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1083
+#: src/slic3r/GUI/MainFrame.cpp:1299
 msgid "(Re)Slice No&w"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1083
+#: src/slic3r/GUI/MainFrame.cpp:1299
 msgid "Start new slicing process"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1087
+#: src/slic3r/GUI/MainFrame.cpp:1303
 msgid "&Repair STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1087
+#: src/slic3r/GUI/MainFrame.cpp:1303
 msgid "Automatically repair an STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1091
+#: src/slic3r/GUI/MainFrame.cpp:1307
 msgid "&G-code preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264
+#: src/slic3r/GUI/MainFrame.cpp:1310 src/slic3r/GUI/MainFrame.cpp:1544
 msgid "&Quit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1094 src/slic3r/GUI/MainFrame.cpp:1264
+#: src/slic3r/GUI/MainFrame.cpp:1310 src/slic3r/GUI/MainFrame.cpp:1544
 #, possible-c-format
 msgid "Quit %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1109
+#: src/slic3r/GUI/MainFrame.cpp:1325
 msgid "&Select all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1110
+#: src/slic3r/GUI/MainFrame.cpp:1326
 msgid "Selects all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1112
+#: src/slic3r/GUI/MainFrame.cpp:1328
 msgid "D&eselect all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1113
+#: src/slic3r/GUI/MainFrame.cpp:1329
 msgid "Deselects all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1116
+#: src/slic3r/GUI/MainFrame.cpp:1332
 msgid "&Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1117
+#: src/slic3r/GUI/MainFrame.cpp:1333
 msgid "Deletes the current selection"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1119
+#: src/slic3r/GUI/MainFrame.cpp:1335
 msgid "Delete &all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1120
+#: src/slic3r/GUI/MainFrame.cpp:1336
 msgid "Deletes all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1124
+#: src/slic3r/GUI/MainFrame.cpp:1340
 msgid "&Undo"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1127
+#: src/slic3r/GUI/MainFrame.cpp:1343
 msgid "&Redo"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1132
+#: src/slic3r/GUI/MainFrame.cpp:1348
 msgid "&Copy"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1133
+#: src/slic3r/GUI/MainFrame.cpp:1349
 msgid "Copy selection to clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1135
+#: src/slic3r/GUI/MainFrame.cpp:1351
 msgid "&Paste"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1136
+#: src/slic3r/GUI/MainFrame.cpp:1352
 msgid "Paste clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1141 src/slic3r/GUI/MainFrame.cpp:1145
-#: src/slic3r/GUI/MainFrame.cpp:1248 src/slic3r/GUI/MainFrame.cpp:1252
+#: src/slic3r/GUI/MainFrame.cpp:1357 src/slic3r/GUI/MainFrame.cpp:1361
+#: src/slic3r/GUI/MainFrame.cpp:1528 src/slic3r/GUI/MainFrame.cpp:1532
 msgid "Re&load from disk"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1151
+#: src/slic3r/GUI/MainFrame.cpp:1367
 msgid "Searc&h"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1152
+#: src/slic3r/GUI/MainFrame.cpp:1368
 msgid "Search in settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1160
+#: src/slic3r/GUI/MainFrame.cpp:1376
 msgid "&Plater Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1160
+#: src/slic3r/GUI/MainFrame.cpp:1376
 msgid "Show the plater"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1165
+#: src/slic3r/GUI/MainFrame.cpp:1381
 msgid "P&rint Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1165
+#: src/slic3r/GUI/MainFrame.cpp:1381
 msgid "Show the print settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1168 src/slic3r/GUI/MainFrame.cpp:1308
+#: src/slic3r/GUI/MainFrame.cpp:1384 src/slic3r/GUI/MainFrame.cpp:1588
 msgid "&Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1168
+#: src/slic3r/GUI/MainFrame.cpp:1384
 msgid "Show the filament settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1172
+#: src/slic3r/GUI/MainFrame.cpp:1388
 msgid "Print&er Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1172
+#: src/slic3r/GUI/MainFrame.cpp:1388
 msgid "Show the printer settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1178
+#: src/slic3r/GUI/MainFrame.cpp:1394
 msgid "3&D"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1178
+#: src/slic3r/GUI/MainFrame.cpp:1394
 msgid "Show the 3D editing view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1181
+#: src/slic3r/GUI/MainFrame.cpp:1397
 msgid "Pre&view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1181
+#: src/slic3r/GUI/MainFrame.cpp:1397
 msgid "Show the 3D slices preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1187
+#: src/slic3r/GUI/MainFrame.cpp:1403
+msgid "Modify Shapes Gallery"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1403
+msgid "Open the dialog to modify shapes gallery"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1415
 msgid "Print &Host Upload Queue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1187
+#: src/slic3r/GUI/MainFrame.cpp:1415
 msgid "Display the Print Host Upload Queue window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1201
+#: src/slic3r/GUI/MainFrame.cpp:1423
+msgid "Compare presets"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1433
 msgid "Show &labels"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1201
+#: src/slic3r/GUI/MainFrame.cpp:1433
 msgid "Show object/instance labels in 3D scene"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1204
+#: src/slic3r/GUI/MainFrame.cpp:1436
 msgid "&Collapse sidebar"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1204 src/slic3r/GUI/Plater.cpp:2255
+#: src/slic3r/GUI/MainFrame.cpp:1436 src/slic3r/GUI/Plater.cpp:2178
 msgid "Collapse sidebar"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1216 src/slic3r/GUI/MainFrame.cpp:1279
+#: src/slic3r/GUI/MainFrame.cpp:1441
+msgid "&Full screen"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1441
+msgid "Full screen"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1456 src/slic3r/GUI/MainFrame.cpp:1559
 msgid "&File"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1217
+#: src/slic3r/GUI/MainFrame.cpp:1457
 msgid "&Edit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1218
+#: src/slic3r/GUI/MainFrame.cpp:1458
 msgid "&Window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1219 src/slic3r/GUI/MainFrame.cpp:1280
+#: src/slic3r/GUI/MainFrame.cpp:1459 src/slic3r/GUI/MainFrame.cpp:1560
 msgid "&View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1222 src/slic3r/GUI/MainFrame.cpp:1283
+#: src/slic3r/GUI/MainFrame.cpp:1462 src/slic3r/GUI/MainFrame.cpp:1563
 msgid "&Help"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1244
+#: src/slic3r/GUI/MainFrame.cpp:1524
 msgid "&Open G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1260
+#: src/slic3r/GUI/MainFrame.cpp:1540
 msgid "Open &PrusaSlicer"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1305
+#: src/slic3r/GUI/MainFrame.cpp:1585
 msgid "E&xport"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1306
+#: src/slic3r/GUI/MainFrame.cpp:1586
 msgid "S&end to print"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1308
+#: src/slic3r/GUI/MainFrame.cpp:1588
 msgid "Mate&rial Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1331
+#: src/slic3r/GUI/MainFrame.cpp:1612
 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1342
+#: src/slic3r/GUI/MainFrame.cpp:1624
 msgid "No previously sliced file."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1348
+#: src/slic3r/GUI/MainFrame.cpp:1631
 msgid "Previously sliced file ("
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1348
+#: src/slic3r/GUI/MainFrame.cpp:1631
 msgid ") not found."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1349
+#: src/slic3r/GUI/MainFrame.cpp:1632
 msgid "File Not Found"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1384
+#: src/slic3r/GUI/MainFrame.cpp:1667
 #, possible-c-format
 msgid "Save %s file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1384
+#: src/slic3r/GUI/MainFrame.cpp:1667
 msgid "SVG"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1384
+#: src/slic3r/GUI/MainFrame.cpp:1667
 msgid "G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1396
+#: src/slic3r/GUI/MainFrame.cpp:1679
 msgid "Save zip file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1405 src/slic3r/GUI/Plater.cpp:3023
-#: src/slic3r/GUI/Plater.cpp:5604 src/slic3r/GUI/Tab.cpp:1589
-#: src/slic3r/GUI/Tab.cpp:4133
+#: src/slic3r/GUI/MainFrame.cpp:1688 src/slic3r/GUI/Plater.cpp:3134
+#: src/slic3r/GUI/Plater.cpp:5928 src/slic3r/GUI/Tab.cpp:1648
+#: src/slic3r/GUI/Tab.cpp:4335
 msgid "Slicing"
 msgstr ""
 
 #. TRN "Processing input_file_basename"
-#: src/slic3r/GUI/MainFrame.cpp:1407
+#: src/slic3r/GUI/MainFrame.cpp:1690
 #, possible-c-format
 msgid "Processing %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1430
+#: src/slic3r/GUI/MainFrame.cpp:1713
 msgid "%1% was successfully sliced."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1432
+#: src/slic3r/GUI/MainFrame.cpp:1716
 msgid "Slicing Done!"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1447
+#: src/slic3r/GUI/MainFrame.cpp:1732
 msgid "Select the STL file to repair:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1457
+#: src/slic3r/GUI/MainFrame.cpp:1742
 msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1469
+#: src/slic3r/GUI/MainFrame.cpp:1753
 msgid "Your file was repaired."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1469 src/libslic3r/PrintConfig.cpp:3816
+#: src/slic3r/GUI/MainFrame.cpp:1753 src/libslic3r/PrintConfig.cpp:4215
 msgid "Repair"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1483
+#: src/slic3r/GUI/MainFrame.cpp:1767
 msgid "Save configuration as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1502 src/slic3r/GUI/MainFrame.cpp:1564
+#: src/slic3r/GUI/MainFrame.cpp:1784
+msgid "Loading of a configuration file"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1786 src/slic3r/GUI/MainFrame.cpp:1851
 msgid "Select configuration to load:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1538
+#: src/slic3r/GUI/MainFrame.cpp:1815
+msgid "Exporting configuration bundle"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1816
+msgid ""
+"Some presets are modified and the unsaved changes will not be exported into "
+"configuration bundle."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1825
 msgid "Save presets bundle as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:1585
+#: src/slic3r/GUI/MainFrame.cpp:1848
+msgid "Loading of a configuration bundle"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:1878
 #, possible-c-format
 msgid "%d presets successfully imported."
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:461
+#: src/slic3r/GUI/Mouse3DController.cpp:453
 msgid "3Dconnexion settings"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:472
+#: src/slic3r/GUI/Mouse3DController.cpp:464
 msgid "Device:"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:477
+#: src/slic3r/GUI/Mouse3DController.cpp:469
 msgid "Speed:"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:480
-#: src/slic3r/GUI/Mouse3DController.cpp:501
+#: src/slic3r/GUI/Mouse3DController.cpp:472
+#: src/slic3r/GUI/Mouse3DController.cpp:493
 msgid "Translation"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:492
-#: src/slic3r/GUI/Mouse3DController.cpp:501
+#: src/slic3r/GUI/Mouse3DController.cpp:484
+#: src/slic3r/GUI/Mouse3DController.cpp:493
 msgid "Zoom"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:498
+#: src/slic3r/GUI/Mouse3DController.cpp:490
 msgid "Deadzone:"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:513
+#: src/slic3r/GUI/Mouse3DController.cpp:505
 msgid "Options:"
 msgstr ""
 
-#: src/slic3r/GUI/Mouse3DController.cpp:516
+#: src/slic3r/GUI/Mouse3DController.cpp:508
 msgid "Swap Y/Z axes"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:70
+#: src/slic3r/GUI/MsgDialog.cpp:148
 #, possible-c-format
 msgid "%s error"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:71
+#: src/slic3r/GUI/MsgDialog.cpp:149
 #, possible-c-format
 msgid "%s has encountered an error"
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:471
+#: src/slic3r/GUI/MsgDialog.cpp:172
+#, possible-c-format
+msgid "%s warning"
+msgstr ""
+
+#: src/slic3r/GUI/MsgDialog.cpp:173
+#, possible-c-format
+msgid "%s has a warning"
+msgstr ""
+
+#: src/slic3r/GUI/MsgDialog.cpp:195
+#, possible-c-format
+msgid "%s info"
+msgstr ""
+
+#: src/slic3r/GUI/MsgDialog.cpp:218
+#, possible-c-format
+msgid "%s information"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:36
 msgid "3D Mouse disconnected."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:474
+#: src/slic3r/GUI/NotificationManager.cpp:37
 msgid "Configuration update is available."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:474
+#: src/slic3r/GUI/NotificationManager.cpp:37
 msgid "See more."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:481
+#: src/slic3r/GUI/NotificationManager.cpp:44
 msgid "New version is available."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:481
+#: src/slic3r/GUI/NotificationManager.cpp:44
 msgid "See Releases page."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.hpp:484
+#: src/slic3r/GUI/NotificationManager.cpp:47
 msgid ""
 "You have just added a G-code for color change, but its value is empty.\n"
 "To export the G-code correctly, check the \"Color Change G-code\" in "
 "\"Printer Settings > Custom G-code\""
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:493
-#: src/slic3r/GUI/NotificationManager.cpp:503
-msgid "More"
+#: src/slic3r/GUI/NotificationManager.cpp:50
+msgid ""
+"No color change event was added to the print. The print does not look like a "
+"sign."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:863
-#: src/slic3r/GUI/NotificationManager.cpp:1134
-msgid "Export G-Code."
+#: src/slic3r/GUI/NotificationManager.cpp:52
+msgid "Desktop integration was successful."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:904
+#: src/slic3r/GUI/NotificationManager.cpp:54
+msgid "Desktop integration failed."
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:56
+msgid "Undo desktop integration was successful."
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:58
+msgid "Undo desktop integration failed."
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:688
 msgid "Open Folder."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:940
+#: src/slic3r/GUI/NotificationManager.cpp:725
 msgid "Eject drive"
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:1053
+#: src/slic3r/GUI/NotificationManager.cpp:958
+msgid "ERROR"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:963
+msgid "CANCELED"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:968
+msgid "COMPLETED"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:1010
+msgid "Cancel upload"
+msgstr ""
+
 #: src/slic3r/GUI/NotificationManager.cpp:1069
-#: src/slic3r/GUI/NotificationManager.cpp:1080
-msgid "ERROR:"
+msgid " Object was loaded with "
+msgid_plural " Objects were loaded with "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:1170
+#: src/slic3r/GUI/NotificationManager.cpp:1184
+msgid "Export G-Code."
 msgstr ""
 
-#: src/slic3r/GUI/NotificationManager.cpp:1058
-#: src/slic3r/GUI/NotificationManager.cpp:1073
-#: src/slic3r/GUI/NotificationManager.cpp:1088
-msgid "WARNING:"
-msgstr ""
-
-#: src/slic3r/GUI/NotificationManager.cpp:1137
-msgid "Slicing finished."
+#: src/slic3r/GUI/NotificationManager.cpp:1170
+#: src/slic3r/GUI/NotificationManager.cpp:1184
+msgid "Export."
 msgstr ""
 
 #: src/slic3r/GUI/NotificationManager.cpp:1184
+msgid "Slicing finished."
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:1508
+#: src/slic3r/GUI/NotificationManager.cpp:1515
+#: src/slic3r/GUI/NotificationManager.cpp:1531
+#: src/slic3r/GUI/NotificationManager.cpp:1537
+#: src/slic3r/GUI/NotificationManager.cpp:1608
+msgid "ERROR:"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:1520
+#: src/slic3r/GUI/NotificationManager.cpp:1547
+#: src/slic3r/GUI/NotificationManager.cpp:1555
+#: src/slic3r/GUI/NotificationManager.cpp:1566 src/slic3r/GUI/Plater.cpp:3001
+msgid "WARNING:"
+msgstr ""
+
+#: src/slic3r/GUI/NotificationManager.cpp:1659
 msgid "Exporting finished."
 msgstr ""
 
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:58
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:50
+msgid "Paint-on seam"
+msgstr ""
+
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:52
+msgid "Sinking"
+msgstr ""
+
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:94
 msgid "Instances"
 msgstr ""
 
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:62
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:225
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:98
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:266
 #, possible-c-format
 msgid "Instance %d"
 msgstr ""
 
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:69 src/slic3r/GUI/Tab.cpp:3980
-#: src/slic3r/GUI/Tab.cpp:4062
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:105 src/slic3r/GUI/Tab.cpp:4179
+#: src/slic3r/GUI/Tab.cpp:4264
 msgid "Layers"
 msgstr ""
 
-#: src/slic3r/GUI/ObjectDataViewModel.cpp:96
+#: src/slic3r/GUI/ObjectDataViewModel.cpp:134
 msgid "Range"
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:259
+#: src/slic3r/GUI/OpenGLManager.cpp:248
 #, possible-c-format
 msgid ""
 "PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
 "while OpenGL version %s, render %s, vendor %s was detected."
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:262
+#: src/slic3r/GUI/OpenGLManager.cpp:251
 msgid "You may need to update your graphics card driver."
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:265
+#: src/slic3r/GUI/OpenGLManager.cpp:254
 msgid ""
 "As a workaround, you may run PrusaSlicer with a software rendered 3D "
-"graphics by running prusa-slicer.exe with the --sw_renderer parameter."
+"graphics by running prusa-slicer.exe with the --sw-renderer parameter."
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:267
+#: src/slic3r/GUI/OpenGLManager.cpp:256
 msgid "Unsupported OpenGL version"
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:275
+#: src/slic3r/GUI/OpenGLManager.cpp:264
 #, possible-c-format
 msgid ""
 "Unable to load the following shaders:\n"
 "%s"
 msgstr ""
 
-#: src/slic3r/GUI/OpenGLManager.cpp:276
+#: src/slic3r/GUI/OpenGLManager.cpp:265
 msgid "Error loading shaders"
 msgstr ""
 
-#: src/slic3r/GUI/OptionsGroup.cpp:334
+#: src/slic3r/GUI/OptionsGroup.cpp:333
 msgctxt "Layers"
 msgid "Top"
 msgstr ""
 
-#: src/slic3r/GUI/OptionsGroup.cpp:334
+#: src/slic3r/GUI/OptionsGroup.cpp:333
 msgctxt "Layers"
 msgid "Bottom"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:51
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:52
 msgid "Delete this preset from this printer device"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:81
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:83
 msgid "This printer will be shown in the presets list as"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:155
-msgid "Physical Printer"
-msgstr ""
-
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:161
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:165
 msgid "Type here the name of your printer device"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:172
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:176
 msgid "Descriptive name for the printer"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:176
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:180
 msgid "Add preset for this printer device"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:205 src/slic3r/GUI/Tab.cpp:2078
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:210 src/slic3r/GUI/Tab.cpp:2179
 msgid "Print Host upload"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:260
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:268
 msgid "Connection to printers connected via the print host failed."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:302
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:310
 msgid "Test"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:307
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:315
 msgid "Could not get a valid Printer Host reference"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:319
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:327
 msgid "Success!"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:329
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:337
 msgid "Refresh Printers"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:356
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:364
 msgid ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:366
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:374
 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:367
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:375
 msgid "Open CA certificate file"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:395
-#: src/libslic3r/PrintConfig.cpp:124
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:404
+#: src/libslic3r/PrintConfig.cpp:297
 msgid "HTTPS CA File"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:396
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:405
 #, possible-c-format
 msgid ""
 "On this system, %s uses HTTPS certificates from the system Certificate Store "
 "or Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:397
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:406
 msgid ""
 "To use a custom CA file, please import your CA file into Certificate Store / "
 "Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:543
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:625
 msgid "The supplied name is empty. It can't be saved."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:547
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:629
 msgid "You should change the name of your printer device."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:555
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:637
 msgid "Printer with name \"%1%\" already exists."
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:556
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:638
 msgid "Replace?"
 msgstr ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:582
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:665
 msgid ""
 "Following printer preset is duplicated:%1%The above preset for printer \"%2%"
 "\" will be used just once."
@@ -5220,675 +6139,633 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:630
+#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:715
 msgid "It's not possible to delete the last related preset for the printer."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:163
+#: src/slic3r/GUI/Plater.cpp:172
 msgid "Volume"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:164
+#: src/slic3r/GUI/Plater.cpp:173
 msgid "Facets"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:165
+#: src/slic3r/GUI/Plater.cpp:174
 msgid "Materials"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:168
-msgid "Manifold"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:218
+#: src/slic3r/GUI/Plater.cpp:232
 msgid "Sliced Info"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:237 src/slic3r/GUI/Plater.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:252 src/slic3r/GUI/Plater.cpp:1234
 msgid "Used Filament (m)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:238 src/slic3r/GUI/Plater.cpp:1171
+#: src/slic3r/GUI/Plater.cpp:253 src/slic3r/GUI/Plater.cpp:1246
 msgid "Used Filament (mm³)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:239 src/slic3r/GUI/Plater.cpp:1178
+#: src/slic3r/GUI/Plater.cpp:254 src/slic3r/GUI/Plater.cpp:1253
 msgid "Used Filament (g)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:240
+#: src/slic3r/GUI/Plater.cpp:255
 msgid "Used Material (unit)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:241
+#: src/slic3r/GUI/Plater.cpp:256
 msgid "Cost (money)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:243
+#: src/slic3r/GUI/Plater.cpp:257 src/slic3r/GUI/Plater.cpp:1216
+#: src/slic3r/GUI/Plater.cpp:1303
+msgid "Estimated printing time"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:258
 msgid "Number of tool changes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:360
+#: src/slic3r/GUI/Plater.cpp:387
 msgid "Select what kind of support do you need"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:362 src/libslic3r/PrintConfig.cpp:2217
-#: src/libslic3r/PrintConfig.cpp:3012
+#: src/slic3r/GUI/Plater.cpp:389 src/libslic3r/PrintConfig.cpp:2490
+#: src/libslic3r/PrintConfig.cpp:3392
 msgid "Support on build plate only"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:363 src/slic3r/GUI/Plater.cpp:489
+#: src/slic3r/GUI/Plater.cpp:390 src/slic3r/GUI/Plater.cpp:518
 msgid "For support enforcers only"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:364
+#: src/slic3r/GUI/Plater.cpp:391
 msgid "Everywhere"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:396 src/slic3r/GUI/Tab.cpp:1481
+#: src/slic3r/GUI/Plater.cpp:423 src/slic3r/GUI/Tab.cpp:1527
 msgid "Brim"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:398
+#: src/slic3r/GUI/Plater.cpp:425
 msgid ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:406
+#: src/slic3r/GUI/Plater.cpp:433
 msgid "Purging volumes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:503
+#: src/slic3r/GUI/Plater.cpp:532
 msgid "Select what kind of pad do you need"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:505
+#: src/slic3r/GUI/Plater.cpp:534
 msgid "Below object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:506
+#: src/slic3r/GUI/Plater.cpp:535
 msgid "Around object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:692
-msgid "SLA print settings"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:753 src/slic3r/GUI/Plater.cpp:6082
+#: src/slic3r/GUI/Plater.cpp:807 src/slic3r/GUI/Plater.cpp:6416
 msgid "Send to printer"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:768 src/slic3r/GUI/Plater.cpp:3023
-#: src/slic3r/GUI/Plater.cpp:5607
+#: src/slic3r/GUI/Plater.cpp:827 src/slic3r/GUI/Plater.cpp:3134
+#: src/slic3r/GUI/Plater.cpp:5931
 msgid "Slice now"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:923
+#: src/slic3r/GUI/Plater.cpp:993
 msgid "Hold Shift to Slice & Export G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1068
+#: src/slic3r/GUI/Plater.cpp:1165
 msgid "%1% (%2$d shell)"
 msgid_plural "%1% (%2$d shells)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Plater.cpp:1097
-msgid "Yes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1118
+#: src/slic3r/GUI/Plater.cpp:1191
 msgid "Used Material (ml)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1121
+#: src/slic3r/GUI/Plater.cpp:1194
 msgid "object"
 msgid_plural "objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Plater.cpp:1121
+#: src/slic3r/GUI/Plater.cpp:1194
 msgid "supports and pad"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:1234
 msgid "Used Filament (in)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1161 src/slic3r/GUI/Plater.cpp:1214
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1289
 msgid "objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1161 src/slic3r/GUI/Plater.cpp:1214
+#: src/slic3r/GUI/Plater.cpp:1236 src/slic3r/GUI/Plater.cpp:1289
 msgid "wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1171
+#: src/slic3r/GUI/Plater.cpp:1246
 msgid "Used Filament (in³)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1197
+#: src/slic3r/GUI/Plater.cpp:1272
 msgid "Filament at extruder %1%"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1203
+#: src/slic3r/GUI/Plater.cpp:1278
 msgid "(including spool)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1212 src/libslic3r/PrintConfig.cpp:847
-#: src/libslic3r/PrintConfig.cpp:2827 src/libslic3r/PrintConfig.cpp:2828
+#: src/slic3r/GUI/Plater.cpp:1287 src/libslic3r/PrintConfig.cpp:1032
+#: src/libslic3r/PrintConfig.cpp:3207 src/libslic3r/PrintConfig.cpp:3208
 msgid "Cost"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1230
+#: src/slic3r/GUI/Plater.cpp:1305
 msgid "normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1240
+#: src/slic3r/GUI/Plater.cpp:1312
 msgid "stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1411 src/slic3r/GUI/Plater.cpp:4942
-#, possible-c-format
-msgid "%s - Drop project file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1418 src/slic3r/GUI/Plater.cpp:4949
-msgid "Open as project"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1419 src/slic3r/GUI/Plater.cpp:4950
-msgid "Import geometry only"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1420 src/slic3r/GUI/Plater.cpp:4951
-msgid "Import config only"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1423 src/slic3r/GUI/Plater.cpp:4954
-msgid "Select an action to apply to the file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1424 src/slic3r/GUI/Plater.cpp:4955
-msgid "Action"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1432 src/slic3r/GUI/Plater.cpp:4963
-msgid "Don't show again"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1477 src/slic3r/GUI/Plater.cpp:5000
-msgid "You can open only one .gcode file at a time."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1478 src/slic3r/GUI/Plater.cpp:5001
-msgid "Drag and drop G-code file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1532 src/slic3r/GUI/Plater.cpp:4817
-#: src/slic3r/GUI/Plater.cpp:5055
-msgid "Import Object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1554 src/slic3r/GUI/Plater.cpp:5081
-msgid "Load File"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1559 src/slic3r/GUI/Plater.cpp:5086
-msgid "Load Files"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1662
+#: src/slic3r/GUI/Plater.cpp:1549
 msgid "Fill bed"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1668
+#: src/slic3r/GUI/Plater.cpp:1555
 msgid "Optimize Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1674
+#: src/slic3r/GUI/Plater.cpp:1561
 msgid "Import SLA archive"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2137
+#: src/slic3r/GUI/Plater.cpp:1599
+msgid "Do you want to save the changes to \"%1%\"?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2052
 #, possible-c-format
 msgid ""
 "Successfully unmounted. The device %s(%s) can now be safely removed from the "
 "computer."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2142
+#: src/slic3r/GUI/Plater.cpp:2057
 #, possible-c-format
 msgid "Ejecting of device %s(%s) has failed."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2161
+#: src/slic3r/GUI/Plater.cpp:2076 src/slic3r/GUI/Plater.cpp:4996
 msgid "New Project"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2254
+#: src/slic3r/GUI/Plater.cpp:2177
 msgid "Expand sidebar"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2327
-msgid "Loading"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2337
-msgid "Loading file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2427
-#, possible-c-format
+#: src/slic3r/GUI/Plater.cpp:2355
 msgid ""
-"The object in file %s looks like saved in inches.\n"
-"Should I consider it as a saved in inches and convert it?"
+"The preset below was temporarily installed on active instance of PrusaSlicer"
 msgid_plural ""
-"Some objects in file %s look like saved in inches.\n"
-"Should I consider them as a saved in inches and convert them?"
+"The presets below were temporarily installed on active instance of "
+"PrusaSlicer"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Plater.cpp:2431
-msgid "The object appears to be saved in inches"
+#: src/slic3r/GUI/Plater.cpp:2385
+msgid "Failed loading file \"%1%\" due to an invalid configuration."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2439
+#: src/slic3r/GUI/Plater.cpp:2408
+#, possible-c-format
+msgid ""
+"The dimensions of the object from file %s seem to be defined in meters.\n"
+"The internal unit of PrusaSlicer are millimeters. Do you want to recalculate "
+"the dimensions of the object?"
+msgid_plural ""
+"The dimensions of some objects from file %s seem to be defined in meters.\n"
+"The internal unit of PrusaSlicer are millimeters. Do you want to recalculate "
+"the dimensions of these objects?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:2412 src/slic3r/GUI/Plater.cpp:2423
+msgid "The object is too small"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2419
+#, possible-c-format
+msgid ""
+"The dimensions of the object from file %s seem to be defined in inches.\n"
+"The internal unit of PrusaSlicer are millimeters. Do you want to recalculate "
+"the dimensions of the object?"
+msgid_plural ""
+"The dimensions of some objects from file %s seem to be defined in inches.\n"
+"The internal unit of PrusaSlicer are millimeters. Do you want to recalculate "
+"the dimensions of these objects?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Plater.cpp:2432
 msgid ""
 "This file contains several objects positioned at multiple heights.\n"
-"Instead of considering them as multiple objects, should I consider\n"
-"this file as a single object having multiple parts?"
+"Instead of considering them as multiple objects, should \n"
+"should the file be loaded as a single object having multiple parts?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2442 src/slic3r/GUI/Plater.cpp:2495
+#: src/slic3r/GUI/Plater.cpp:2435 src/slic3r/GUI/Plater.cpp:2490
 msgid "Multi-part object detected"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2449
+#: src/slic3r/GUI/Plater.cpp:2443
 msgid ""
 "This file cannot be loaded in a simple mode. Do you want to switch to an "
 "advanced mode?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2450
+#: src/slic3r/GUI/Plater.cpp:2444
 msgid "Detected advanced data"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2472
+#: src/slic3r/GUI/Plater.cpp:2464
 #, possible-c-format
 msgid ""
 "You can't to add the object(s) from %s because of one or some of them "
 "is(are) multi-part"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2492
+#: src/slic3r/GUI/Plater.cpp:2487
 msgid ""
 "Multiple objects were loaded for a multi-material printer.\n"
 "Instead of considering them as multiple objects, should I consider\n"
 "these files to represent a single object having multiple parts?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2508
-msgid "Loaded"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2610
+#: src/slic3r/GUI/Plater.cpp:2606
 msgid ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2611
+#: src/slic3r/GUI/Plater.cpp:2607
 msgid "Object too large?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2673
+#: src/slic3r/GUI/Plater.cpp:2684
 msgid "Export STL file:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2680
+#: src/slic3r/GUI/Plater.cpp:2691
 msgid "Export AMF file:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2686
+#: src/slic3r/GUI/Plater.cpp:2697
 msgid "Save file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2692
+#: src/slic3r/GUI/Plater.cpp:2703
 msgid "Export OBJ file:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2788
+#: src/slic3r/GUI/Plater.cpp:2800
 msgid "Delete Object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2799
+#: src/slic3r/GUI/Plater.cpp:2811
+msgid "Delete All Objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2837
 msgid "Reset Project"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2871
+#: src/slic3r/GUI/Plater.cpp:2918
 msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
+"The selected object couldn't be split because it contains only one solid "
+"part."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2882
+#: src/slic3r/GUI/Plater.cpp:2925
+msgid "All non-solid parts (modifiers) were deleted"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2927
 msgid "Split to Objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:3007 src/slic3r/GUI/Plater.cpp:3744
+#: src/slic3r/GUI/Plater.cpp:2983
+msgid ""
+"An object has custom support enforcers which will not be used because "
+"supports are disabled."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2985
+msgid "Enable supports for enforcers only"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3115 src/slic3r/GUI/Plater.cpp:4078
 msgid "Invalid data"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:3017
-msgid "Ready to slice"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3055 src/slic3r/GUI/PrintHostDialogs.cpp:275
-msgid "Cancelling"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3074
+#: src/slic3r/GUI/Plater.cpp:3185
 msgid "Another export job is currently running."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:3191
+#: src/slic3r/GUI/Plater.cpp:3243 src/slic3r/GUI/Plater.cpp:3350
+msgid "Replace from:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3259 src/slic3r/GUI/Plater.cpp:3366
+msgid "Unable to replace with more than one volume"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3259 src/slic3r/GUI/Plater.cpp:3339
+#: src/slic3r/GUI/Plater.cpp:3366
+msgid "Error during replace"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3331
+msgid "Please select the file to replace"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3339
+msgid "File for the replace wasn't selected"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3501
 msgid "Please select the file to reload"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:3226
-msgid "It is not allowed to change the file to reload"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3226
-msgid "Do you want to retry"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3244
-msgid "Reload from:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3337
-msgid "Unable to reload:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3342
-msgid "Error during reload"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3361
-msgid "Reload all from disk"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3388
-msgid ""
-"ERROR: Please close all manipulators available from the left toolbar before "
-"fixing the mesh."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3394
-msgid "Fix through NetFabb"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3411
-msgid "Custom supports and seams were removed after repairing the mesh."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3702
-msgid "There are active warnings concerning sliced models:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3712
-msgid "generated warnings"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:3752 src/slic3r/GUI/PrintHostDialogs.cpp:276
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4019 src/slic3r/GUI/Plater.cpp:4043
-msgid "Remove the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4028
-msgid "Add one more instance of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4030
-msgid "Remove one instance of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4032
-msgid "Set number of instances"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4032
-msgid "Change the number of instances of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4034
-msgid "Fill bed with instances"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4034
-msgid "Fill the remaining area of bed with instances of the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4053
-msgid "Reload the selected object from disk"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4056
-msgid "Export the selected object as STL file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4086
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4086
-msgid "Mirror the selected object along the X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4088
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4088
-msgid "Mirror the selected object along the Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4090
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4090
-msgid "Mirror the selected object along the Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4093
-msgid "Mirror"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4093
-msgid "Mirror the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4105
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4105 src/slic3r/GUI/Plater.cpp:4125
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4107
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4107 src/slic3r/GUI/Plater.cpp:4143
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4110 src/slic3r/GUI/Plater.cpp:4125
-#: src/slic3r/GUI/Plater.cpp:4143 src/libslic3r/PrintConfig.cpp:3840
-msgid "Split"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4110
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4132
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4133
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4213
-msgid "3D editor view"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4585
-msgid ""
-"%1% printer was active at the time the target Undo / Redo snapshot was "
-"taken. Switching to %1% printer requires reloading of %1% presets."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4789
-msgid "Load Project"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4821
-msgid "Import Objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:4887
+#: src/slic3r/GUI/Plater.cpp:3533 src/slic3r/GUI/Plater.cpp:5122
 msgid "The selected file"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:4887
+#: src/slic3r/GUI/Plater.cpp:3534
+msgid "differs from the original file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3534
+msgid "Do you want to replace it"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3541
+msgid "It is not allowed to change the file to reload"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3541
+msgid "Do you want to retry"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3565
+msgid "Reload from:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3667
+msgid "Unable to reload:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3672
+msgid "Error during reload"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3690
+msgid "Reload all from disk"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3724
+msgid ""
+"Processing model '@object_name' with more than 1M triangles could be slow. "
+"It is highly recommend to reduce amount of triangles."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4032
+msgid "There are active warnings concerning sliced models:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4043
+msgid "generated warnings"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4367
+msgid "3D editor view"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4782
+msgid "Undo / Redo is processing"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4784
+msgid ""
+"Switching the printer technology from %1% to %2%.\n"
+"Some %1% presets were modified, which will be lost after switching the "
+"printer technology."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4980
+msgid "Creating a new project while the current project is modified."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4983
+msgid "Creating a new project while some presets are modified."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4984
+msgid "You can keep presets modifications to the new project or discard them"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4985
+msgid ""
+"You can keep presets modifications to the new project, discard them or save "
+"changes as new presets.\n"
+"Note, if changes will be saved than new project wouldn't keep them"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:4991
+msgid "New Project is creating"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5021
+msgid "Load Project"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5047 src/slic3r/GUI/Plater.cpp:5306
+msgid "Import Object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5051
+msgid "Import Objects"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5122
 msgid "does not contain valid gcode."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:4888
+#: src/slic3r/GUI/Plater.cpp:5123
 msgid "Error while loading .gcode file"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5130
+#: src/slic3r/GUI/Plater.cpp:5176
+#, possible-c-format
+msgid "%s - Drop project file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5183
+msgid "Open as project"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5184
+msgid "Import geometry only"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5185
+msgid "Import config only"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5188
+msgid "Select an action to apply to the file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5193
+msgid "Action"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5209
+msgid "Don't show again"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5250
+msgid "You can open only one .gcode file at a time."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5251
+msgid "Drag and drop G-code file"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5328
+msgid "Load File"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5333
+msgid "Load Files"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:5378
 msgid "All objects will be removed, continue?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5138
+#: src/slic3r/GUI/Plater.cpp:5389
 msgid "Delete Selected Objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5146
+#: src/slic3r/GUI/Plater.cpp:5397
 msgid "Increase Instances"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5180
+#: src/slic3r/GUI/Plater.cpp:5431
 msgid "Decrease Instances"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5211
+#: src/slic3r/GUI/Plater.cpp:5482
 msgid "Enter the number of copies:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5212
+#: src/slic3r/GUI/Plater.cpp:5483
 msgid "Copies of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5216
+#: src/slic3r/GUI/Plater.cpp:5487
 #, possible-c-format
 msgid "Set numbers of copies to %d"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5282
+#: src/slic3r/GUI/Plater.cpp:5560
 msgid "Cut by Plane"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5339
+#: src/slic3r/GUI/Plater.cpp:5620
 msgid "Save G-code file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5339
-msgid "Save SL1 file as:"
+#: src/slic3r/GUI/Plater.cpp:5620
+msgid "Save SL1 / SL1S file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5486
-#, possible-c-format
-msgid "STL file exported to %s"
+#: src/slic3r/GUI/Plater.cpp:5817
+msgid ""
+"The plater is empty.\n"
+"Confirm you want to save the project ?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5503
-#, possible-c-format
-msgid "AMF file exported to %s"
+#: src/slic3r/GUI/Plater.cpp:5817
+msgid "Save project"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:5506
-#, possible-c-format
-msgid "Error exporting AMF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5535
-#, possible-c-format
-msgid "3MF file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:5540
-#, possible-c-format
-msgid "Error exporting 3MF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:6081
+#: src/slic3r/GUI/Plater.cpp:6415
 msgid "Export"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:6178
+#: src/slic3r/GUI/Plater.cpp:6449
+msgid ""
+"Custom supports, seams and multimaterial painting were removed after "
+"repairing the mesh."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:6563
 msgid "Paste From Clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:56 src/slic3r/GUI/Tab.cpp:2112
-#: src/slic3r/GUI/Tab.cpp:2299 src/slic3r/GUI/Tab.cpp:2407
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1082
+#: src/slic3r/GUI/Preferences.cpp:74 src/slic3r/GUI/Tab.cpp:2214
+#: src/slic3r/GUI/Tab.cpp:2437 src/slic3r/GUI/Tab.cpp:2547
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1279
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1667
 msgid "General"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/Preferences.cpp:87
 msgid "Remember output directory"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:71
+#: src/slic3r/GUI/Preferences.cpp:89
 msgid ""
 "If this is enabled, Slic3r will prompt the last output directory instead of "
 "the one containing the input files."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:77
+#: src/slic3r/GUI/Preferences.cpp:95
 msgid "Auto-center parts"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:79
+#: src/slic3r/GUI/Preferences.cpp:97
 msgid ""
 "If this is enabled, Slic3r will auto-center objects around the print bed "
 "center."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:85
+#: src/slic3r/GUI/Preferences.cpp:103
 msgid "Background processing"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:87
+#: src/slic3r/GUI/Preferences.cpp:105
 msgid ""
 "If this is enabled, Slic3r will pre-process objects as soon as they're "
 "loaded in order to save time when exporting G-code."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:96
+#: src/slic3r/GUI/Preferences.cpp:114
 msgid ""
 "If enabled, PrusaSlicer will check for the new versions of itself online. "
 "When a new version becomes available a notification is displayed at the next "
@@ -5896,25 +6773,25 @@ msgid ""
 "notification mechanisms, no automatic installation is done."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:102
+#: src/slic3r/GUI/Preferences.cpp:120
 msgid "Export sources full pathnames to 3mf and amf"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:104
+#: src/slic3r/GUI/Preferences.cpp:122
 msgid ""
 "If enabled, allows the Reload from disk command to automatically find and "
 "load the files when invoked."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:114
+#: src/slic3r/GUI/Preferences.cpp:131
 msgid "If enabled, sets PrusaSlicer as default application to open .3mf files."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:121
+#: src/slic3r/GUI/Preferences.cpp:138
 msgid "If enabled, sets PrusaSlicer as default application to open .stl files."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:131
+#: src/slic3r/GUI/Preferences.cpp:147
 msgid ""
 "If enabled, Slic3r downloads updates of built-in system presets in the "
 "background. These updates are downloaded into a separate temporary location. "
@@ -5922,293 +6799,369 @@ msgid ""
 "startup."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:136
+#: src/slic3r/GUI/Preferences.cpp:152
 msgid "Suppress \" - default - \" presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:138
+#: src/slic3r/GUI/Preferences.cpp:154
 msgid ""
 "Suppress \" - default - \" presets in the Print / Filament / Printer "
 "selections once there are any other valid presets available."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:144
+#: src/slic3r/GUI/Preferences.cpp:160
 msgid "Show incompatible print and filament presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:146
+#: src/slic3r/GUI/Preferences.cpp:162
 msgid ""
 "When checked, the print and filament presets are shown in the preset editor "
 "even if they are marked as incompatible with the active printer"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:152
+#: src/slic3r/GUI/Preferences.cpp:168
 msgid "Show drop project dialog"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:154
+#: src/slic3r/GUI/Preferences.cpp:170
 msgid ""
 "When checked, whenever dragging and dropping a project file on the "
 "application, shows a dialog asking to select the action to take on the file "
 "to load."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:161 src/slic3r/GUI/Preferences.cpp:165
+#: src/slic3r/GUI/Preferences.cpp:177 src/slic3r/GUI/Preferences.cpp:181
 msgid "Allow just a single PrusaSlicer instance"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:163
+#: src/slic3r/GUI/Preferences.cpp:179
 msgid ""
 "On OSX there is always only one instance of app running by default. However "
 "it is allowed to run multiple instances of same app from the command line. "
 "In such case this settings will allow only one instance."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:167
+#: src/slic3r/GUI/Preferences.cpp:183
 msgid ""
 "If this is enabled, when starting PrusaSlicer and another instance of the "
 "same PrusaSlicer is already running, that instance will be reactivated "
 "instead."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:173
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:671
-msgid "Ask for unsaved changes when closing application"
+#: src/slic3r/GUI/Preferences.cpp:189
+msgid "Ask for unsaved changes when closing application or loading new project"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:175
-msgid "When closing the application, always ask for unsaved changes"
+#: src/slic3r/GUI/Preferences.cpp:191
+msgid ""
+"Always ask for unsaved changes, when: \n"
+"- Closing PrusaSlicer while some presets are modified,\n"
+"- Loading a new project while some presets are modified"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:180
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:672
+#: src/slic3r/GUI/Preferences.cpp:198
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:895
 msgid "Ask for unsaved changes when selecting new preset"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:182
-msgid "Always ask for unsaved changes when selecting new preset"
+#: src/slic3r/GUI/Preferences.cpp:200
+msgid ""
+"Always ask for unsaved changes when selecting new preset or resetting a "
+"preset"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:190
+#: src/slic3r/GUI/Preferences.cpp:205
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:894
+msgid "Ask for unsaved changes when creating new project"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:207
+msgid "Always ask for unsaved changes when creating new project"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:214
 msgid "Associate .gcode files to PrusaSlicer G-code Viewer"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:192
+#: src/slic3r/GUI/Preferences.cpp:216
 msgid ""
 "If enabled, sets PrusaSlicer G-code Viewer as default application to open ."
 "gcode files."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:201
+#: src/slic3r/GUI/Preferences.cpp:224
 msgid "Use Retina resolution for the 3D scene"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:203
+#: src/slic3r/GUI/Preferences.cpp:226
 msgid ""
 "If enabled, the 3D scene will be rendered in Retina resolution. If you are "
 "experiencing 3D performance problems, disabling this option may help."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:211 src/slic3r/GUI/Preferences.cpp:213
+#: src/slic3r/GUI/Preferences.cpp:234 src/slic3r/GUI/Preferences.cpp:236
 msgid "Show splash screen"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:220
+#: src/slic3r/GUI/Preferences.cpp:242
+msgid "Clear Undo / Redo stack on new project"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:244
+msgid ""
+"Clear Undo / Redo stack on new project or when an existing project is loaded."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:250
 msgid "Enable support for legacy 3DConnexion devices"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:222
+#: src/slic3r/GUI/Preferences.cpp:252
 msgid ""
 "If enabled, the legacy 3DConnexion devices settings dialog is available by "
 "pressing CTRL+M"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:232
+#: src/slic3r/GUI/Preferences.cpp:261
 msgid "Camera"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:237
+#: src/slic3r/GUI/Preferences.cpp:266
 msgid "Use perspective camera"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:239
+#: src/slic3r/GUI/Preferences.cpp:268
 msgid ""
 "If enabled, use perspective camera. If not enabled, use orthographic camera."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:244
+#: src/slic3r/GUI/Preferences.cpp:273
 msgid "Use free camera"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:246
+#: src/slic3r/GUI/Preferences.cpp:275
 msgid "If enabled, use free camera. If not enabled, use constrained camera."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:251
+#: src/slic3r/GUI/Preferences.cpp:280
 msgid "Reverse direction of zoom with mouse wheel"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:253
+#: src/slic3r/GUI/Preferences.cpp:282
 msgid "If enabled, reverses the direction of zoom with mouse wheel"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:261
+#: src/slic3r/GUI/Preferences.cpp:290
 msgid "GUI"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:276
+#: src/slic3r/GUI/Preferences.cpp:305
 msgid "Sequential slider applied only to top layer"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:278
+#: src/slic3r/GUI/Preferences.cpp:307
 msgid ""
 "If enabled, changes made using the sequential slider, in preview, apply only "
-"to gcode top layer. If disabled, changes made using the sequential slider, "
-"in preview, apply to the whole gcode."
+"to gcode top layer.If disabled, changes made using the sequential slider, in "
+"preview, apply to the whole gcode."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:285
+#: src/slic3r/GUI/Preferences.cpp:314
 msgid "Show sidebar collapse/expand button"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:287
+#: src/slic3r/GUI/Preferences.cpp:316
 msgid ""
 "If enabled, the button for the collapse sidebar will be appeared in top "
 "right corner of the 3D Scene"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:292
+#: src/slic3r/GUI/Preferences.cpp:321
 msgid "Suppress to open hyperlink in browser"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:294
+#: src/slic3r/GUI/Preferences.cpp:323
 msgid ""
 "If enabled, the descriptions of configuration parameters in settings tabs "
 "wouldn't work as hyperlinks. If disabled, the descriptions of configuration "
 "parameters in settings tabs will work as hyperlinks."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:300
+#: src/slic3r/GUI/Preferences.cpp:329
+msgid "Use colors for axes values in Manipulation panel"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:331
+msgid ""
+"If enabled, the axes names and axes values will be colorized according to "
+"the axes colors. If disabled, old UI will be used."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:337
+msgid "Order object volumes by types"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:339
+msgid ""
+"If enabled, volumes will be always ordered inside the object. Correct order "
+"is Model Part, Negative Volume, Modifier, Support Blocker and Support "
+"Enforcer. If disabled, you can reorder Model Parts, Negative Volumes and "
+"Modifiers. But one of the model parts have to be on the first place."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:346
+msgid "Use Dark color mode (experimental)"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:348
+msgid ""
+"If enabled, UI will use Dark mode colors. If disabled, old UI will be used."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:354
+msgid "Set settings tabs as menu items (experimental)"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:356
+msgid ""
+"If enabled, Settings Tabs will be placed as menu items. If disabled, old UI "
+"will be used."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:363
+msgid "Show \"Tip of the day\" notification after start"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:365
+msgid "If enabled, useful hints are displayed at startup."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:370
 msgid "Use custom size for toolbar icons"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:302
+#: src/slic3r/GUI/Preferences.cpp:372
 msgid "If enabled, you can change size of toolbar icons manually."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:321
+#: src/slic3r/GUI/Preferences.cpp:391
 msgid "Render"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:326
+#: src/slic3r/GUI/Preferences.cpp:396
 msgid "Use environment map"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:328
+#: src/slic3r/GUI/Preferences.cpp:398
 msgid "If enabled, renders object using the environment map."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:353
-#, possible-c-format
-msgid "You need to restart %s to make the changes effective."
+#: src/slic3r/GUI/Preferences.cpp:436
+msgid "Changes for the critical options"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:432
+#: src/slic3r/GUI/Preferences.cpp:438
+msgid ""
+"Changing fo some options will trigger application restart.\n"
+"You will lose content of the plater."
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:543
 msgid "Icon size in a respect to the default size"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:447
+#: src/slic3r/GUI/Preferences.cpp:558
 msgid "Select toolbar icon size in respect to the default one."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:478
+#: src/slic3r/GUI/Preferences.cpp:592 src/slic3r/GUI/Preferences.cpp:603
 msgid "Old regular layout with the tab bar"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:479
+#: src/slic3r/GUI/Preferences.cpp:593
 msgid "New layout, access via settings button in the top menu"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:480
+#: src/slic3r/GUI/Preferences.cpp:594 src/slic3r/GUI/Preferences.cpp:604
 msgid "Settings in non-modal window"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:489
+#: src/slic3r/GUI/Preferences.cpp:612
 msgid "Layout Options"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:510
+#: src/slic3r/GUI/Preferences.cpp:655
 msgid "Text color Settings"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:224
-#: src/slic3r/GUI/PresetComboBoxes.cpp:262
-#: src/slic3r/GUI/PresetComboBoxes.cpp:788
-#: src/slic3r/GUI/PresetComboBoxes.cpp:838
-#: src/slic3r/GUI/PresetComboBoxes.cpp:963
-#: src/slic3r/GUI/PresetComboBoxes.cpp:1007
+#: src/slic3r/GUI/PresetComboBoxes.cpp:249
+#: src/slic3r/GUI/PresetComboBoxes.cpp:287
+#: src/slic3r/GUI/PresetComboBoxes.cpp:778
+#: src/slic3r/GUI/PresetComboBoxes.cpp:828
+#: src/slic3r/GUI/PresetComboBoxes.cpp:968
+#: src/slic3r/GUI/PresetComboBoxes.cpp:1012
 msgid "System presets"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:266
-#: src/slic3r/GUI/PresetComboBoxes.cpp:842
-#: src/slic3r/GUI/PresetComboBoxes.cpp:1011
+#: src/slic3r/GUI/PresetComboBoxes.cpp:291
+#: src/slic3r/GUI/PresetComboBoxes.cpp:832
+#: src/slic3r/GUI/PresetComboBoxes.cpp:1016
 msgid "User presets"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:277
+#: src/slic3r/GUI/PresetComboBoxes.cpp:302
 msgid "Incompatible presets"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:312
+#: src/slic3r/GUI/PresetComboBoxes.cpp:337
 msgid "Are you sure you want to delete \"%1%\" printer?"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:314
+#: src/slic3r/GUI/PresetComboBoxes.cpp:340
 msgid "Delete Physical Printer"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:651
+#: src/slic3r/GUI/PresetComboBoxes.cpp:601
 msgid "Click to edit preset"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:707
-#: src/slic3r/GUI/PresetComboBoxes.cpp:737
+#: src/slic3r/GUI/PresetComboBoxes.cpp:691
+#: src/slic3r/GUI/PresetComboBoxes.cpp:721
 msgid "Add/Remove presets"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:712
-#: src/slic3r/GUI/PresetComboBoxes.cpp:742 src/slic3r/GUI/Tab.cpp:3004
+#: src/slic3r/GUI/PresetComboBoxes.cpp:696
+#: src/slic3r/GUI/PresetComboBoxes.cpp:726 src/slic3r/GUI/Tab.cpp:3168
 msgid "Add physical printer"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:726
+#: src/slic3r/GUI/PresetComboBoxes.cpp:710
 msgid "Edit preset"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:730 src/slic3r/GUI/Tab.cpp:3004
+#: src/slic3r/GUI/PresetComboBoxes.cpp:714 src/slic3r/GUI/Tab.cpp:3168
 msgid "Edit physical printer"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:733
+#: src/slic3r/GUI/PresetComboBoxes.cpp:717
 msgid "Delete physical printer"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:853
-#: src/slic3r/GUI/PresetComboBoxes.cpp:1025
+#: src/slic3r/GUI/PresetComboBoxes.cpp:843
+#: src/slic3r/GUI/PresetComboBoxes.cpp:1030
 msgid "Physical printers"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:877
+#: src/slic3r/GUI/PresetComboBoxes.cpp:867
 msgid "Add/Remove filaments"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:879
+#: src/slic3r/GUI/PresetComboBoxes.cpp:869
 msgid "Add/Remove materials"
 msgstr ""
 
-#: src/slic3r/GUI/PresetComboBoxes.cpp:881
-#: src/slic3r/GUI/PresetComboBoxes.cpp:1049
+#: src/slic3r/GUI/PresetComboBoxes.cpp:871
+#: src/slic3r/GUI/PresetComboBoxes.cpp:1054
 msgid "Add/Remove printers"
 msgstr ""
 
@@ -6253,207 +7206,225 @@ msgstr ""
 msgid "Fan will be turned off."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:159
+#: src/slic3r/GUI/PresetHints.cpp:164
 msgid "external perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:168
+#: src/slic3r/GUI/PresetHints.cpp:165
 msgid "perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:177
+#: src/slic3r/GUI/PresetHints.cpp:168
 msgid "infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:187
+#: src/slic3r/GUI/PresetHints.cpp:170
 msgid "solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:195
+#: src/slic3r/GUI/PresetHints.cpp:172
 msgid "top solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:206
+#: src/slic3r/GUI/PresetHints.cpp:175
 msgid "support"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:216
+#: src/slic3r/GUI/PresetHints.cpp:177
 msgid "support interface"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:222
+#: src/slic3r/GUI/PresetHints.cpp:181
 msgid "First layer volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:222
+#: src/slic3r/GUI/PresetHints.cpp:181
 msgid "Bridging volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:222
+#: src/slic3r/GUI/PresetHints.cpp:181
 msgid "Volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:223
+#: src/slic3r/GUI/PresetHints.cpp:182
 msgid "flow rate is maximized"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:226
+#: src/slic3r/GUI/PresetHints.cpp:185
 msgid "by the print profile maximum"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:227
+#: src/slic3r/GUI/PresetHints.cpp:186
 msgid "when printing"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:228
+#: src/slic3r/GUI/PresetHints.cpp:187
 msgid "with a volumetric rate"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:232
+#: src/slic3r/GUI/PresetHints.cpp:191
 #, possible-c-format
 msgid "%3.2f mm³/s at filament speed %3.2f mm/s."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:250
+#: src/slic3r/GUI/PresetHints.cpp:209
 msgid ""
 "Recommended object thin wall thickness: Not available due to invalid layer "
 "height."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:266
+#: src/slic3r/GUI/PresetHints.cpp:215
 #, possible-c-format
 msgid "Recommended object thin wall thickness for layer height %.2f and"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:273
+#: src/slic3r/GUI/PresetHints.cpp:230
 #, possible-c-format
 msgid "%d lines: %.2f mm"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:277
+#: src/slic3r/GUI/PresetHints.cpp:234
 msgid ""
 "Recommended object thin wall thickness: Not available due to excessively "
 "small extrusion width."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:306
+#: src/slic3r/GUI/PresetHints.cpp:263
 msgid ""
 "Top / bottom shell thickness hint: Not available due to invalid layer height."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:319
+#: src/slic3r/GUI/PresetHints.cpp:276
 msgid "Top shell is %1% mm thick for layer height %2% mm."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:322
+#: src/slic3r/GUI/PresetHints.cpp:279
 msgid "Minimum top shell thickness is %1% mm."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:325
+#: src/slic3r/GUI/PresetHints.cpp:282
 msgid "Top is open."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:338
+#: src/slic3r/GUI/PresetHints.cpp:295
 msgid "Bottom shell is %1% mm thick for layer height %2% mm."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:341
+#: src/slic3r/GUI/PresetHints.cpp:298
 msgid "Minimum bottom shell thickness is %1% mm."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:344
+#: src/slic3r/GUI/PresetHints.cpp:301
 msgid "Bottom is open."
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:35
+#: src/slic3r/GUI/PrintHostDialogs.cpp:42
 msgid "Send G-Code to printer host"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:35
+#: src/slic3r/GUI/PrintHostDialogs.cpp:42
 msgid "Upload to Printer Host with the following filename:"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:37
+#: src/slic3r/GUI/PrintHostDialogs.cpp:44
 msgid "Start printing after upload"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:45
+#: src/slic3r/GUI/PrintHostDialogs.cpp:52
 msgid "Use forward slashes ( / ) as a directory separator if needed."
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:58
+#: src/slic3r/GUI/PrintHostDialogs.cpp:65
 msgid "Group"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:187
+#: src/slic3r/GUI/PrintHostDialogs.cpp:97
+#, possible-c-format
+msgid "Upload filename doesn't end with \"%s\". Do you wish to continue?"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:230
 msgid "ID"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:188
+#: src/slic3r/GUI/PrintHostDialogs.cpp:231
 msgid "Progress"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:189
+#: src/slic3r/GUI/PrintHostDialogs.cpp:232
 msgid "Status"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:190
+#: src/slic3r/GUI/PrintHostDialogs.cpp:233
 msgid "Host"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:191
+#: src/slic3r/GUI/PrintHostDialogs.cpp:234
+msgctxt "OfFile"
+msgid "Size"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:235
 msgid "Filename"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:192
+#: src/slic3r/GUI/PrintHostDialogs.cpp:236
 msgid "Error Message"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:195
+#: src/slic3r/GUI/PrintHostDialogs.cpp:239
 msgid "Cancel selected"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:197
+#: src/slic3r/GUI/PrintHostDialogs.cpp:241
 msgid "Show error message"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:239
-#: src/slic3r/GUI/PrintHostDialogs.cpp:272
+#: src/slic3r/GUI/PrintHostDialogs.cpp:299
+#: src/slic3r/GUI/PrintHostDialogs.cpp:346
 msgid "Enqueued"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:273
+#: src/slic3r/GUI/PrintHostDialogs.cpp:347
 msgid "Uploading"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:277
+#: src/slic3r/GUI/PrintHostDialogs.cpp:349
+msgid "Cancelling"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:350
+msgid "Cancelled"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:351
 msgid "Completed"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:315
+#: src/slic3r/GUI/PrintHostDialogs.cpp:399
 msgid "Error uploading to print host:"
 msgstr ""
 
-#: src/slic3r/GUI/RammingChart.cpp:23
+#: src/slic3r/GUI/RammingChart.cpp:29
 msgid "NO RAMMING AT ALL"
 msgstr ""
 
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:83
-#: src/libslic3r/PrintConfig.cpp:731 src/libslic3r/PrintConfig.cpp:775
-#: src/libslic3r/PrintConfig.cpp:790 src/libslic3r/PrintConfig.cpp:2725
-#: src/libslic3r/PrintConfig.cpp:2734 src/libslic3r/PrintConfig.cpp:2844
-#: src/libslic3r/PrintConfig.cpp:2852 src/libslic3r/PrintConfig.cpp:2860
-#: src/libslic3r/PrintConfig.cpp:2867 src/libslic3r/PrintConfig.cpp:2875
-#: src/libslic3r/PrintConfig.cpp:2883
+#: src/slic3r/GUI/RammingChart.cpp:90 src/slic3r/GUI/WipeTowerDialog.cpp:114
+#: src/libslic3r/PrintConfig.cpp:916 src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:3105
+#: src/libslic3r/PrintConfig.cpp:3114 src/libslic3r/PrintConfig.cpp:3224
+#: src/libslic3r/PrintConfig.cpp:3232 src/libslic3r/PrintConfig.cpp:3240
+#: src/libslic3r/PrintConfig.cpp:3247 src/libslic3r/PrintConfig.cpp:3255
+#: src/libslic3r/PrintConfig.cpp:3263
 msgid "s"
 msgstr ""
 
-#: src/slic3r/GUI/RammingChart.cpp:81
+#: src/slic3r/GUI/RammingChart.cpp:95
 msgid "Volumetric speed"
 msgstr ""
 
-#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:688
-#: src/libslic3r/PrintConfig.cpp:1547
+#: src/slic3r/GUI/RammingChart.cpp:95 src/libslic3r/PrintConfig.cpp:873
+#: src/libslic3r/PrintConfig.cpp:1749
 msgid "mm³/s"
 msgstr ""
 
@@ -6513,416 +7484,502 @@ msgstr ""
 msgid "Save preset"
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:220
+#: src/slic3r/GUI/SavePresetDialog.cpp:221
 msgctxt "PresetName"
 msgid "Copy"
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:278
+#: src/slic3r/GUI/SavePresetDialog.cpp:283
 msgid ""
 "You have selected physical printer \"%1%\" \n"
 "with related printer preset \"%2%\""
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:311
+#: src/slic3r/GUI/SavePresetDialog.cpp:322
 msgid "What would you like to do with \"%1%\" preset after saving?"
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:314
+#: src/slic3r/GUI/SavePresetDialog.cpp:325
 msgid "Change \"%1%\" to \"%2%\" for this physical printer \"%3%\""
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:315
+#: src/slic3r/GUI/SavePresetDialog.cpp:326
 msgid "Add \"%1%\" as a next preset for the the physical printer \"%2%\""
 msgstr ""
 
-#: src/slic3r/GUI/SavePresetDialog.cpp:316
+#: src/slic3r/GUI/SavePresetDialog.cpp:327
 msgid "Just switch to \"%1%\" preset"
 msgstr ""
 
-#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2435
+#: src/slic3r/GUI/Search.cpp:90 src/slic3r/GUI/Search.cpp:345
+#: src/slic3r/GUI/Tab.cpp:2575
 msgid "Stealth"
 msgstr ""
 
-#: src/slic3r/GUI/Search.cpp:77 src/slic3r/GUI/Tab.cpp:2429
+#: src/slic3r/GUI/Search.cpp:90 src/slic3r/GUI/Search.cpp:345
+#: src/slic3r/GUI/Tab.cpp:2569
 msgid "Normal"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:172
+#: src/slic3r/GUI/Selection.cpp:166
 msgid "Selection-Add"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:213
+#: src/slic3r/GUI/Selection.cpp:207
 msgid "Selection-Remove"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:245
+#: src/slic3r/GUI/Selection.cpp:239
 msgid "Selection-Add Object"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:264
+#: src/slic3r/GUI/Selection.cpp:258
 msgid "Selection-Remove Object"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:282
+#: src/slic3r/GUI/Selection.cpp:276
 msgid "Selection-Add Instance"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:301
+#: src/slic3r/GUI/Selection.cpp:295
 msgid "Selection-Remove Instance"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:402
+#: src/slic3r/GUI/Selection.cpp:392
 msgid "Selection-Add All"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:428
+#: src/slic3r/GUI/Selection.cpp:417
 msgid "Selection-Remove All"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:960
+#: src/slic3r/GUI/Selection.cpp:952
 msgid "Scale To Fit"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:1487
-msgid "Set Printable Instance"
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:103
+msgid "Data to send"
 msgstr ""
 
-#: src/slic3r/GUI/Selection.cpp:1487
-msgid "Set Unprintable Instance"
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:453
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:526
+msgid "Send system info"
 msgstr ""
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:83
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:485
+msgid ""
+"This is the first time you are running %1%. We would like to ask you to send "
+"some of your system information to us. This will only happen once and we "
+"will not ask you to do this again (only after you upgrade to the next "
+"version)."
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:489
+msgid ""
+"If we know your hardware, operating system, etc., it will greatly help us in "
+"development and prioritization, because we will be able to focus our effort "
+"more efficiently and spend time on features that are needed the most."
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:492
+msgid "Is it safe?"
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:494
+msgid ""
+"We do not send any personal information nor anything that would allow us to "
+"identify you later. To detect duplicate entries, a unique number derived "
+"from your system is sent, but the source information cannot be "
+"reconstructed. Apart from that, only general data about your OS, hardware "
+"and OpenGL installation are sent. PrusaSlicer is open source, if you want to "
+"inspect the code actually performing the communication, see %1%."
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:501
+msgid "Show verbatim data that will be sent"
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:524
+msgid "Ask me next time"
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:525
+msgid "Do not send anything"
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:600
+msgid "System info sent successfully. Thank you."
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:603
+msgid "Sending system info failed! Status: %1%"
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:609
+msgid "Sending system info was cancelled."
+msgstr ""
+
+#: src/slic3r/GUI/SendSystemInfoDialog.cpp:616
+msgid "Sending system info..."
+msgstr ""
+
+#: src/slic3r/GUI/SysInfoDialog.cpp:84
 msgid "System Information"
 msgstr ""
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:164
+#: src/slic3r/GUI/SysInfoDialog.cpp:150
+msgid "Blacklisted libraries loaded into PrusaSlicer process:"
+msgstr ""
+
+#: src/slic3r/GUI/SysInfoDialog.cpp:162
+msgid "Eigen vectorization supported:"
+msgstr ""
+
+#: src/slic3r/GUI/SysInfoDialog.cpp:169
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:109 src/libslic3r/PrintConfig.cpp:346
+#: src/slic3r/GUI/Tab.cpp:114 src/libslic3r/PrintConfig.cpp:531
 msgid "Compatible printers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:110
+#: src/slic3r/GUI/Tab.cpp:115
 msgid "Select the printers this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:115 src/libslic3r/PrintConfig.cpp:361
+#: src/slic3r/GUI/Tab.cpp:120 src/libslic3r/PrintConfig.cpp:546
 msgid "Compatible print profiles"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:116
+#: src/slic3r/GUI/Tab.cpp:121
 msgid "Select the print profiles this profile is compatible with."
 msgstr ""
 
+#: src/slic3r/GUI/Tab.cpp:216
+msgid "Compare this preset with some another"
+msgstr ""
+
 #. TRN "Save current Settings"
-#: src/slic3r/GUI/Tab.cpp:211
+#: src/slic3r/GUI/Tab.cpp:218
 #, possible-c-format
 msgid "Save current %s"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:212
+#: src/slic3r/GUI/Tab.cpp:219
 msgid "Delete this preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:216
+#: src/slic3r/GUI/Tab.cpp:223
 msgid ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:220
+#: src/slic3r/GUI/Tab.cpp:227
 msgid "Search in settings [%1%]"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1237
+#: src/slic3r/GUI/Tab.cpp:1285
 msgid "Detach from system preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1250
+#: src/slic3r/GUI/Tab.cpp:1298
 msgid ""
 "A copy of the current system preset will be created, which will be detached "
 "from the system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1251
+#: src/slic3r/GUI/Tab.cpp:1299
 msgid ""
 "The current custom preset will be detached from the parent system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1254
+#: src/slic3r/GUI/Tab.cpp:1302
 msgid "Modifications to the current profile will be saved."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1257
-msgid ""
-"This action is not revertable.\n"
-"Do you want to proceed?"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1259
+#: src/slic3r/GUI/Tab.cpp:1308
 msgid "Detach preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1285
+#: src/slic3r/GUI/Tab.cpp:1334
 msgid "This is a default preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1287
+#: src/slic3r/GUI/Tab.cpp:1336
 msgid "This is a system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1289
+#: src/slic3r/GUI/Tab.cpp:1338
 msgid "Current preset is inherited from the default preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1293
+#: src/slic3r/GUI/Tab.cpp:1342
 msgid "Current preset is inherited from"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1297
+#: src/slic3r/GUI/Tab.cpp:1346
 msgid "It can't be deleted or modified."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1298
+#: src/slic3r/GUI/Tab.cpp:1347
 msgid ""
 "Any modifications should be saved as a new preset inherited from this one."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1299
+#: src/slic3r/GUI/Tab.cpp:1348
 msgid "To do that please specify a new name for the preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1303
+#: src/slic3r/GUI/Tab.cpp:1352
 msgid "Additional information:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1309
+#: src/slic3r/GUI/Tab.cpp:1358
 msgid "printer model"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1317
+#: src/slic3r/GUI/Tab.cpp:1366
 msgid "default print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1320
+#: src/slic3r/GUI/Tab.cpp:1369
 msgid "default filament profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1334
+#: src/slic3r/GUI/Tab.cpp:1383
 msgid "default SLA material profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1338
+#: src/slic3r/GUI/Tab.cpp:1387
 msgid "default SLA print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1346
+#: src/slic3r/GUI/Tab.cpp:1395
 msgid "full profile name"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1347
+#: src/slic3r/GUI/Tab.cpp:1396
 msgid "symbolic profile name"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1385 src/slic3r/GUI/Tab.cpp:4060
+#: src/slic3r/GUI/Tab.cpp:1434 src/slic3r/GUI/Tab.cpp:4262
 msgid "Layers and perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1391
+#: src/slic3r/GUI/Tab.cpp:1440
 msgid "Vertical shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1403
+#: src/slic3r/GUI/Tab.cpp:1452
 msgid "Horizontal shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1404 src/libslic3r/PrintConfig.cpp:2069
+#: src/slic3r/GUI/Tab.cpp:1453 src/libslic3r/PrintConfig.cpp:2318
 msgid "Solid layers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1409
+#: src/slic3r/GUI/Tab.cpp:1458
 msgid "Minimum shell thickness"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1420
+#: src/slic3r/GUI/Tab.cpp:1469
 msgid "Quality (slower slicing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1432
+#: src/slic3r/GUI/Tab.cpp:1483
 msgid "Fuzzy skin (experimental)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1460
+#: src/slic3r/GUI/Tab.cpp:1506
 msgid "Reducing printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1494
+#: src/slic3r/GUI/Tab.cpp:1520 src/libslic3r/ExtrusionEntity.cpp:352
+msgid "Skirt"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:1542
 msgid "Raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1498
+#: src/slic3r/GUI/Tab.cpp:1547
 msgid "Options for support material and raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1513
+#: src/slic3r/GUI/Tab.cpp:1567
 msgid "Speed for print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1526
+#: src/slic3r/GUI/Tab.cpp:1580
 msgid "Speed for non-print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1529
+#: src/slic3r/GUI/Tab.cpp:1584
 msgid "Modifiers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1532
+#: src/slic3r/GUI/Tab.cpp:1588
 msgid "Acceleration control (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1539
+#: src/slic3r/GUI/Tab.cpp:1596
 msgid "Autospeed (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1547
+#: src/slic3r/GUI/Tab.cpp:1604
 msgid "Multiple Extruders"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1555
+#: src/slic3r/GUI/Tab.cpp:1612
 msgid "Ooze prevention"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1573
+#: src/slic3r/GUI/Tab.cpp:1632
 msgid "Extrusion width"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1583
+#: src/slic3r/GUI/Tab.cpp:1642
 msgid "Overlap"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1586
+#: src/slic3r/GUI/Tab.cpp:1645
 msgid "Flow"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1595
+#: src/slic3r/GUI/Tab.cpp:1655
 msgid "Other"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1598 src/slic3r/GUI/Tab.cpp:4136
+#: src/slic3r/GUI/Tab.cpp:1658 src/slic3r/GUI/Tab.cpp:4339
 msgid "Output options"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1599
+#: src/slic3r/GUI/Tab.cpp:1659
 msgid "Sequential printing"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1601
+#: src/slic3r/GUI/Tab.cpp:1661
 msgid "Extruder clearance"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1606 src/slic3r/GUI/Tab.cpp:4137
+#: src/slic3r/GUI/Tab.cpp:1666 src/slic3r/GUI/Tab.cpp:4340
 msgid "Output file"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1613 src/libslic3r/PrintConfig.cpp:1751
+#: src/slic3r/GUI/Tab.cpp:1673 src/libslic3r/PrintConfig.cpp:1956
 msgid "Post-processing scripts"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1619 src/slic3r/GUI/Tab.cpp:1620
-#: src/slic3r/GUI/Tab.cpp:1941 src/slic3r/GUI/Tab.cpp:1942
-#: src/slic3r/GUI/Tab.cpp:2280 src/slic3r/GUI/Tab.cpp:2281
-#: src/slic3r/GUI/Tab.cpp:2356 src/slic3r/GUI/Tab.cpp:2357
-#: src/slic3r/GUI/Tab.cpp:4003 src/slic3r/GUI/Tab.cpp:4004
+#: src/slic3r/GUI/Tab.cpp:1679 src/slic3r/GUI/Tab.cpp:1680
+#: src/slic3r/GUI/Tab.cpp:2034 src/slic3r/GUI/Tab.cpp:2035
+#: src/slic3r/GUI/Tab.cpp:2418 src/slic3r/GUI/Tab.cpp:2419
+#: src/slic3r/GUI/Tab.cpp:2494 src/slic3r/GUI/Tab.cpp:2495
+#: src/slic3r/GUI/Tab.cpp:4202 src/slic3r/GUI/Tab.cpp:4203
 msgid "Notes"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1626 src/slic3r/GUI/Tab.cpp:1949
-#: src/slic3r/GUI/Tab.cpp:2287 src/slic3r/GUI/Tab.cpp:2363
-#: src/slic3r/GUI/Tab.cpp:4011 src/slic3r/GUI/Tab.cpp:4142
+#: src/slic3r/GUI/Tab.cpp:1686 src/slic3r/GUI/Tab.cpp:2042
+#: src/slic3r/GUI/Tab.cpp:2425 src/slic3r/GUI/Tab.cpp:2501
+#: src/slic3r/GUI/Tab.cpp:4210 src/slic3r/GUI/Tab.cpp:4345
 msgid "Dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1627 src/slic3r/GUI/Tab.cpp:1950
-#: src/slic3r/GUI/Tab.cpp:2288 src/slic3r/GUI/Tab.cpp:2364
-#: src/slic3r/GUI/Tab.cpp:4012 src/slic3r/GUI/Tab.cpp:4143
+#: src/slic3r/GUI/Tab.cpp:1687 src/slic3r/GUI/Tab.cpp:2043
+#: src/slic3r/GUI/Tab.cpp:2426 src/slic3r/GUI/Tab.cpp:2502
+#: src/slic3r/GUI/Tab.cpp:4211 src/slic3r/GUI/Tab.cpp:4346
 msgid "Profile dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1707
+#: src/slic3r/GUI/Tab.cpp:1774
+#, possible-c-format
+msgid ""
+"The following line %s contains reserved keywords.\n"
+"Please remove it, as it may cause problems in G-code visualization and "
+"printing time estimation."
+msgid_plural ""
+"The following lines %s contain reserved keywords.\n"
+"Please remove them, as they may cause problems in G-code visualization and "
+"printing time estimation."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/slic3r/GUI/Tab.cpp:1779
+msgid "Found reserved keywords in"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:1793
 msgid "Filament Overrides"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1829
-msgid "Temperature"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1830
+#: src/slic3r/GUI/Tab.cpp:1916
 msgid "Nozzle"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1835
+#: src/slic3r/GUI/Tab.cpp:1921
 msgid "Bed"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1840
+#: src/slic3r/GUI/Tab.cpp:1926
 msgid "Cooling"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1842 src/libslic3r/PrintConfig.cpp:1654
-#: src/libslic3r/PrintConfig.cpp:2517
+#: src/slic3r/GUI/Tab.cpp:1928 src/libslic3r/PrintConfig.cpp:1859
+#: src/libslic3r/PrintConfig.cpp:2889
 msgid "Enable"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1853
+#: src/slic3r/GUI/Tab.cpp:1939
 msgid "Fan settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1864
+#: src/slic3r/GUI/Tab.cpp:1950
 msgid "Cooling thresholds"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1870
+#: src/slic3r/GUI/Tab.cpp:1956
 msgid "Filament properties"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1877
+#: src/slic3r/GUI/Tab.cpp:1963
 msgid "Print speed override"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1887
+#: src/slic3r/GUI/Tab.cpp:1973
 msgid "Wipe tower parameters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1890
+#: src/slic3r/GUI/Tab.cpp:1976
 msgid "Toolchange parameters with single extruder MM printers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1903
+#: src/slic3r/GUI/Tab.cpp:1989
 msgid "Ramming settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1926 src/slic3r/GUI/Tab.cpp:2219
-#: src/libslic3r/PrintConfig.cpp:2152
+#: src/slic3r/GUI/Tab.cpp:2013 src/slic3r/GUI/Tab.cpp:2330
+#: src/slic3r/GUI/Tab.cpp:3884 src/libslic3r/GCode.cpp:704
+#: src/libslic3r/PrintConfig.cpp:2401
 msgid "Custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1927 src/slic3r/GUI/Tab.cpp:2220
-#: src/libslic3r/PrintConfig.cpp:2102 src/libslic3r/PrintConfig.cpp:2117
+#: src/slic3r/GUI/Tab.cpp:2014 src/slic3r/GUI/Tab.cpp:2331
+#: src/libslic3r/GCode.cpp:678 src/libslic3r/PrintConfig.cpp:2351
+#: src/libslic3r/PrintConfig.cpp:2366
 msgid "Start G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1934 src/slic3r/GUI/Tab.cpp:2227
-#: src/libslic3r/PrintConfig.cpp:466 src/libslic3r/PrintConfig.cpp:476
+#: src/slic3r/GUI/Tab.cpp:2024 src/slic3r/GUI/Tab.cpp:2341
+#: src/libslic3r/GCode.cpp:679 src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:661
 msgid "End G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1984
+#: src/slic3r/GUI/Tab.cpp:2077
 msgid "Volumetric flow hints not available"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2080
+#: src/slic3r/GUI/Tab.cpp:2181
 msgid ""
 "Note: All parameters from this group are moved to the Physical Printer "
 "settings (see changelog).\n"
@@ -6935,19 +7992,20 @@ msgid ""
 "physical_printer directory."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2113 src/slic3r/GUI/Tab.cpp:2300
+#: src/slic3r/GUI/Tab.cpp:2215 src/slic3r/GUI/Tab.cpp:2438
 msgid "Size and coordinates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2122 src/slic3r/GUI/UnsavedChangesDialog.cpp:1082
+#: src/slic3r/GUI/Tab.cpp:2224 src/slic3r/GUI/UnsavedChangesDialog.cpp:1279
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1667
 msgid "Capabilities"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2127
+#: src/slic3r/GUI/Tab.cpp:2229
 msgid "Number of extruders of the printer."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2155
+#: src/slic3r/GUI/Tab.cpp:2258
 msgid ""
 "Single Extruder Multi Material is selected, \n"
 "and all extruders must have the same diameter.\n"
@@ -6955,161 +8013,170 @@ msgid ""
 "nozzle diameter value?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2158 src/slic3r/GUI/Tab.cpp:2566
-#: src/libslic3r/PrintConfig.cpp:1623
+#: src/slic3r/GUI/Tab.cpp:2262 src/slic3r/GUI/Tab.cpp:2703
+#: src/libslic3r/PrintConfig.cpp:1825
 msgid "Nozzle diameter"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2234 src/libslic3r/PrintConfig.cpp:209
+#: src/slic3r/GUI/Tab.cpp:2351 src/libslic3r/GCode.cpp:680
+#: src/libslic3r/PrintConfig.cpp:391
 msgid "Before layer change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2241 src/libslic3r/PrintConfig.cpp:1362
+#: src/slic3r/GUI/Tab.cpp:2361 src/libslic3r/GCode.cpp:681
+#: src/libslic3r/PrintConfig.cpp:1551
 msgid "After layer change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2248 src/libslic3r/PrintConfig.cpp:2410
+#: src/slic3r/GUI/Tab.cpp:2371 src/libslic3r/GCode.cpp:682
+#: src/libslic3r/PrintConfig.cpp:2773
 msgid "Tool change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2255
+#: src/slic3r/GUI/Tab.cpp:2381 src/libslic3r/GCode.cpp:683
 msgid "Between objects G-code (for sequential printing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2262
+#: src/slic3r/GUI/Tab.cpp:2391 src/libslic3r/GCode.cpp:684
 msgid "Color Change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2268 src/libslic3r/PrintConfig.cpp:2143
+#: src/slic3r/GUI/Tab.cpp:2400 src/libslic3r/GCode.cpp:685
+#: src/libslic3r/PrintConfig.cpp:2392
 msgid "Pause Print G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2274
+#: src/slic3r/GUI/Tab.cpp:2409 src/libslic3r/GCode.cpp:686
 msgid "Template Custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2307
+#: src/slic3r/GUI/Tab.cpp:2445
 msgid "Display"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2322
+#: src/slic3r/GUI/Tab.cpp:2460
 msgid "Tilt"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2323
+#: src/slic3r/GUI/Tab.cpp:2461
 msgid "Tilt time"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2329 src/slic3r/GUI/Tab.cpp:3987
+#: src/slic3r/GUI/Tab.cpp:2467 src/slic3r/GUI/Tab.cpp:4186
 msgid "Corrections"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2346 src/slic3r/GUI/Tab.cpp:3983
+#: src/slic3r/GUI/Tab.cpp:2484 src/slic3r/GUI/Tab.cpp:4182
 msgid "Exposure"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2405 src/slic3r/GUI/Tab.cpp:2499
-#: src/libslic3r/PrintConfig.cpp:1391 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1443 src/libslic3r/PrintConfig.cpp:1460
-#: src/libslic3r/PrintConfig.cpp:1476 src/libslic3r/PrintConfig.cpp:1486
-#: src/libslic3r/PrintConfig.cpp:1496 src/libslic3r/PrintConfig.cpp:1506
+#: src/slic3r/GUI/Tab.cpp:2545 src/slic3r/GUI/Tab.cpp:2630
+#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1615
+#: src/libslic3r/PrintConfig.cpp:1632 src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1665 src/libslic3r/PrintConfig.cpp:1675
+#: src/libslic3r/PrintConfig.cpp:1685 src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:1708
 msgid "Machine limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2428
+#: src/slic3r/GUI/Tab.cpp:2568
 msgid "Values in this column are for Normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2434
+#: src/slic3r/GUI/Tab.cpp:2574
 msgid "Values in this column are for Stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2443
+#: src/slic3r/GUI/Tab.cpp:2583
 msgid "Maximum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2448
+#: src/slic3r/GUI/Tab.cpp:2588
 msgid "Maximum accelerations"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2455
+#: src/slic3r/GUI/Tab.cpp:2597
 msgid "Jerk limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2460
+#: src/slic3r/GUI/Tab.cpp:2602
 msgid "Minimum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2524 src/slic3r/GUI/Tab.cpp:2532
+#: src/slic3r/GUI/Tab.cpp:2655 src/slic3r/GUI/Tab.cpp:2664
 msgid "Single extruder MM setup"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2533
+#: src/slic3r/GUI/Tab.cpp:2665
 msgid "Single extruder multimaterial parameters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2564
+#: src/slic3r/GUI/Tab.cpp:2700
 msgid ""
 "This is a single extruder multimaterial printer, diameters of all extruders "
 "will be set to the new value. Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2588
+#: src/slic3r/GUI/Tab.cpp:2725
 msgid "Layer height limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2593
+#: src/slic3r/GUI/Tab.cpp:2730
 msgid "Position (for multi-extruder printers)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2599
+#: src/slic3r/GUI/Tab.cpp:2736
 msgid "Only lift Z"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2612
+#: src/slic3r/GUI/Tab.cpp:2749
 msgid ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2619
+#: src/slic3r/GUI/Tab.cpp:2756
 msgid "Reset to Filament Color"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2797
+#: src/slic3r/GUI/Tab.cpp:2936
 msgid ""
 "The Wipe option is not available when using the Firmware Retraction mode.\n"
 "\n"
 "Shall I disable it in order to enable Firmware Retraction?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2799
+#: src/slic3r/GUI/Tab.cpp:2938
 msgid "Firmware Retraction"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3390
+#: src/slic3r/GUI/Tab.cpp:3239
+msgid "New printer preset is selecting"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3545
 msgid "Detached"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3453
+#: src/slic3r/GUI/Tab.cpp:3611
 msgid "remove"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3453
+#: src/slic3r/GUI/Tab.cpp:3611
 msgid "delete"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3462
+#: src/slic3r/GUI/Tab.cpp:3620
 msgid "It's a last preset for this physical printer."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3467
+#: src/slic3r/GUI/Tab.cpp:3625
 msgid ""
 "Are you sure you want to delete \"%1%\" preset from the physical printer "
 "\"%2%\"?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3479
+#: src/slic3r/GUI/Tab.cpp:3637
 msgid ""
 "The physical printer below is based on the preset, you are going to delete."
 msgid_plural ""
@@ -7117,14 +8184,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Tab.cpp:3484
+#: src/slic3r/GUI/Tab.cpp:3642
 msgid "Note, that selected preset will be deleted from this printer too."
 msgid_plural ""
 "Note, that selected preset will be deleted from these printers too."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Tab.cpp:3489
+#: src/slic3r/GUI/Tab.cpp:3647
 msgid ""
 "The physical printer below is based only on the preset, you are going to "
 "delete."
@@ -7134,7 +8201,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Tab.cpp:3494
+#: src/slic3r/GUI/Tab.cpp:3652
 msgid ""
 "Note, that this printer will be deleted after deleting of the selected "
 "preset."
@@ -7144,54 +8211,54 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/slic3r/GUI/Tab.cpp:3499
+#: src/slic3r/GUI/Tab.cpp:3657
 msgid "Are you sure you want to %1% the selected preset?"
 msgstr ""
 
 #. TRN  Remove/Delete
-#: src/slic3r/GUI/Tab.cpp:3504
+#: src/slic3r/GUI/Tab.cpp:3662
 msgid "%1% Preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3585 src/slic3r/GUI/Tab.cpp:3657
+#: src/slic3r/GUI/Tab.cpp:3745 src/slic3r/GUI/Tab.cpp:3818
 msgid "Set"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3721
+#: src/slic3r/GUI/Tab.cpp:3910
 msgid ""
 "Machine limits will be emitted to G-code and used to estimate print time."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3724
+#: src/slic3r/GUI/Tab.cpp:3913
 msgid ""
 "Machine limits will NOT be emitted to G-code, however they will be used to "
 "estimate print time, which may therefore not be accurate as the printer may "
 "apply a different set of machine limits."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3728
+#: src/slic3r/GUI/Tab.cpp:3917
 msgid ""
 "Machine limits are not set, therefore the print time estimate may not be "
 "accurate."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3750
+#: src/slic3r/GUI/Tab.cpp:3939
 msgid "LOCKED LOCK"
 msgstr ""
 
 #. TRN Description for "LOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3752
+#: src/slic3r/GUI/Tab.cpp:3941
 msgid ""
 "indicates that the settings are the same as the system (or default) values "
 "for the current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3754
+#: src/slic3r/GUI/Tab.cpp:3943
 msgid "UNLOCKED LOCK"
 msgstr ""
 
 #. TRN Description for "UNLOCKED LOCK"
-#: src/slic3r/GUI/Tab.cpp:3756
+#: src/slic3r/GUI/Tab.cpp:3945
 msgid ""
 "indicates that some settings were changed and are not equal to the system "
 "(or default) values for the current option group.\n"
@@ -7199,23 +8266,23 @@ msgid ""
 "to the system (or default) values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3761
+#: src/slic3r/GUI/Tab.cpp:3950
 msgid "WHITE BULLET"
 msgstr ""
 
 #. TRN Description for "WHITE BULLET"
-#: src/slic3r/GUI/Tab.cpp:3763
+#: src/slic3r/GUI/Tab.cpp:3952
 msgid ""
 "for the left button: indicates a non-system (or non-default) preset,\n"
 "for the right button: indicates that the settings hasn't been modified."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3766
+#: src/slic3r/GUI/Tab.cpp:3955
 msgid "BACK ARROW"
 msgstr ""
 
 #. TRN Description for "BACK ARROW"
-#: src/slic3r/GUI/Tab.cpp:3768
+#: src/slic3r/GUI/Tab.cpp:3957
 msgid ""
 "indicates that the settings were changed and are not equal to the last saved "
 "preset for the current option group.\n"
@@ -7223,13 +8290,13 @@ msgid ""
 "to the last saved preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3778
+#: src/slic3r/GUI/Tab.cpp:3967
 msgid ""
 "LOCKED LOCK icon indicates that the settings are the same as the system (or "
 "default) values for the current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3780
+#: src/slic3r/GUI/Tab.cpp:3969
 msgid ""
 "UNLOCKED LOCK icon indicates that some settings were changed and are not "
 "equal to the system (or default) values for the current option group.\n"
@@ -7237,17 +8304,17 @@ msgid ""
 "default) values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3783
+#: src/slic3r/GUI/Tab.cpp:3972
 msgid "WHITE BULLET icon indicates a non system (or non default) preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3786
+#: src/slic3r/GUI/Tab.cpp:3975
 msgid ""
 "WHITE BULLET icon indicates that the settings are the same as in the last "
 "saved preset for the current option group."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3788
+#: src/slic3r/GUI/Tab.cpp:3977
 msgid ""
 "BACK ARROW icon indicates that the settings were changed and are not equal "
 "to the last saved preset for the current option group.\n"
@@ -7255,197 +8322,258 @@ msgid ""
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3794
+#: src/slic3r/GUI/Tab.cpp:3983
 msgid ""
 "LOCKED LOCK icon indicates that the value is the same as the system (or "
 "default) value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3795
+#: src/slic3r/GUI/Tab.cpp:3984
 msgid ""
 "UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
 "the system (or default) value.\n"
 "Click to reset current value to the system (or default) value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3801
+#: src/slic3r/GUI/Tab.cpp:3990
 msgid ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3802
+#: src/slic3r/GUI/Tab.cpp:3991
 msgid ""
 "BACK ARROW icon indicates that the value was changed and is not equal to the "
 "last saved preset.\n"
 "Click to reset current value to the last saved preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3946 src/slic3r/GUI/Tab.cpp:3948
+#: src/slic3r/GUI/Tab.cpp:4145 src/slic3r/GUI/Tab.cpp:4147
 msgid "Material"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4070
+#: src/slic3r/GUI/Tab.cpp:4272
 msgid "Support head"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4075
+#: src/slic3r/GUI/Tab.cpp:4277
 msgid "Support pillar"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4098
+#: src/slic3r/GUI/Tab.cpp:4300
 msgid "Connection of the support sticks and junctions"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4103
+#: src/slic3r/GUI/Tab.cpp:4305
 msgid "Automatic generation"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4177
+#: src/slic3r/GUI/Tab.cpp:4380
 msgid ""
 "\"%1%\" is disabled because \"%2%\" is on in \"%3%\" category.\n"
 "To enable \"%1%\", please switch off \"%2%\""
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4179 src/libslic3r/PrintConfig.cpp:3091
+#: src/slic3r/GUI/Tab.cpp:4382 src/libslic3r/PrintConfig.cpp:3471
 msgid "Object elevation"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:4179 src/libslic3r/PrintConfig.cpp:3193
+#: src/slic3r/GUI/Tab.cpp:4382 src/libslic3r/PrintConfig.cpp:3573
 msgid "Pad around object"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:370 src/slic3r/GUI/Tab.hpp:492
-msgid "Print Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:401
-msgid "Filament Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:442
-msgid "Printer Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:476
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:149
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:158
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:857
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:153
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:162
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1050
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1103
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1118
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1133
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1148
 msgid "Undef"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:537
-msgid "PrusaSlicer is closing: Unsaved Changes"
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:771
+msgid "Unsaved Changes"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:554
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:789
 msgid "Switching Presets: Unsaved Changes"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:620
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:831
 msgid "Old Value"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:621
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:832
 msgid "New Value"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:652
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:863
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:866
+msgid "Keep"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:863
 msgid "Transfer"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:653
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:870
+msgid "Don't save"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:870
 msgid "Discard"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:654
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:876
 msgid "Save"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:674
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:896
+msgid "Ask for unsaved changes when ??closing application??"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:897
+msgid ""
+"You will not be asked about the unsaved changes the next time you create new "
+"project"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:898
+msgid ""
+"You will not be asked about the unsaved changes the next time you switch a "
+"preset"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:899
+msgid ""
+"You will not be asked about the unsaved changes the next time you: \n"
+"- close the application,\n"
+"- load project,\n"
+"- process Undo / Redo with change of print technologie,\n"
+"- take/load snapshot,\n"
+"- load config file/bundle,\n"
+"- export config_bundle"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:906
 msgid "PrusaSlicer will remember your action."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:676
-msgid ""
-"You will not be asked about the unsaved changes the next time you close "
-"PrusaSlicer."
-msgstr ""
-
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:677
-msgid ""
-"You will not be asked about the unsaved changes the next time you switch a "
-"preset."
-msgstr ""
-
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:678
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:907
 msgid ""
 "Visit \"Preferences\" and check \"%1%\"\n"
 "to be asked about unsaved changes again."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:680
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:909
 msgid "PrusaSlicer: Don't ask me again"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:747
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:939
 msgid ""
 "Some fields are too long to fit. Right mouse click reveals the full text."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:749
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:941
+msgid "All settings changes will not be saved"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:941
 msgid "All settings changes will be discarded."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:944
 msgid "Save the selected options."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:752
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:945
+msgid "Keep the selected settings."
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:946
 msgid "Transfer the selected settings to the newly selected preset."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:756
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:950
 msgid "Save the selected options to preset \"%1%\"."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:757
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:951
 msgid "Transfer the selected options to the newly selected preset \"%1%\"."
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1021
-msgid "The following presets were modified:"
-msgstr ""
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1218
+msgid "The following preset was modified"
+msgid_plural "The following presets were modified"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1026
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1224
 msgid "Preset \"%1%\" has the following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1030
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1228
 msgid ""
 "Preset \"%1%\" is not compatible with the new printer profile and it has the "
 "following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1031
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1229
 msgid ""
 "Preset \"%1%\" is not compatible with the new print profile and it has the "
 "following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1077
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1275
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1663
 msgid "Extruders count"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1199
-msgid "Old value"
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1497
+msgid "Show all preset (including incompatible)"
 msgstr ""
 
-#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1200
-msgid "New value"
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1512
+msgid "Left Preset Value"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1513
+msgid "Right Preset Value"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1558
+msgid "Compare Presets"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1558
+msgid "Compare %1% Presets"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1620
+msgid "One of the presets doesn't found"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1631
+msgid "Comparable printer presets has different printer technology"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1645
+msgid "Presets are the same"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1653
+msgid ""
+"Presets are different.\n"
+"Click this button to select the same as left preset for the right preset."
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1677
+msgid "Undef category"
+msgstr ""
+
+#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1677
+msgid "Undef group"
 msgstr ""
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:38
@@ -7469,8 +8597,8 @@ msgstr ""
 msgid "Changelog && Download"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:60 src/slic3r/GUI/UpdateDialogs.cpp:125
-#: src/slic3r/GUI/UpdateDialogs.cpp:183
+#: src/slic3r/GUI/UpdateDialogs.cpp:60 src/slic3r/GUI/UpdateDialogs.cpp:128
+#: src/slic3r/GUI/UpdateDialogs.cpp:194
 msgid "Open changelog page"
 msgstr ""
 
@@ -7482,15 +8610,26 @@ msgstr ""
 msgid "Don't notify about new releases any more"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:89 src/slic3r/GUI/UpdateDialogs.cpp:266
+#: src/slic3r/GUI/UpdateDialogs.cpp:89
+msgid "Opening Configuration Wizard"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:89 src/slic3r/GUI/UpdateDialogs.cpp:277
 msgid "Configuration update"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:89
-msgid "Configuration update is available"
+#: src/slic3r/GUI/UpdateDialogs.cpp:90
+msgid ""
+"PrusaSlicer is not using the newest configuration available.\n"
+"Configuration Wizard may not offer the latest printers, filaments and SLA "
+"materials to be installed. "
 msgstr ""
 
 #: src/slic3r/GUI/UpdateDialogs.cpp:92
+msgid "Configuration update is available"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:95
 msgid ""
 "Would you like to install it?\n"
 "\n"
@@ -7500,20 +8639,24 @@ msgid ""
 "Updated configuration bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:113 src/slic3r/GUI/UpdateDialogs.cpp:173
+#: src/slic3r/GUI/UpdateDialogs.cpp:116 src/slic3r/GUI/UpdateDialogs.cpp:184
 msgid "Comment:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:148 src/slic3r/GUI/UpdateDialogs.cpp:210
+#: src/slic3r/GUI/UpdateDialogs.cpp:136
+msgid "Install"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:159 src/slic3r/GUI/UpdateDialogs.cpp:221
 #, possible-c-format
 msgid "%s incompatibility"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:148
+#: src/slic3r/GUI/UpdateDialogs.cpp:159
 msgid "You must install a configuration update."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:151
+#: src/slic3r/GUI/UpdateDialogs.cpp:162
 #, possible-c-format
 msgid ""
 "%s will now start updates. Otherwise it won't be able to start.\n"
@@ -7524,17 +8667,17 @@ msgid ""
 "Updated configuration bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:191 src/slic3r/GUI/UpdateDialogs.cpp:246
+#: src/slic3r/GUI/UpdateDialogs.cpp:202 src/slic3r/GUI/UpdateDialogs.cpp:257
 #, possible-c-format
 msgid "Exit %s"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:211
+#: src/slic3r/GUI/UpdateDialogs.cpp:222
 #, possible-c-format
 msgid "%s configuration is incompatible"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:216
+#: src/slic3r/GUI/UpdateDialogs.cpp:227
 #, possible-c-format
 msgid ""
 "This version of %s is not compatible with currently installed configuration "
@@ -7547,20 +8690,20 @@ msgid ""
 "existing configuration before installing files compatible with this %s."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:225
+#: src/slic3r/GUI/UpdateDialogs.cpp:236
 #, possible-c-format
 msgid "This %s version: %s"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:230
+#: src/slic3r/GUI/UpdateDialogs.cpp:241
 msgid "Incompatible bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:249
+#: src/slic3r/GUI/UpdateDialogs.cpp:260
 msgid "Re-configure"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:270
+#: src/slic3r/GUI/UpdateDialogs.cpp:281
 #, possible-c-format
 msgid ""
 "%s now uses an updated configuration structure.\n"
@@ -7576,28 +8719,28 @@ msgid ""
 "choose whether to enable automatic preset updates."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:287
+#: src/slic3r/GUI/UpdateDialogs.cpp:298
 msgid "For more information please visit our wiki page:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:304
+#: src/slic3r/GUI/UpdateDialogs.cpp:317
 msgid "Configuration updates"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:304
+#: src/slic3r/GUI/UpdateDialogs.cpp:317
 msgid "No updates available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:309
+#: src/slic3r/GUI/UpdateDialogs.cpp:322
 #, possible-c-format
 msgid "%s has no configuration updates available."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:15
+#: src/slic3r/GUI/WipeTowerDialog.cpp:21
 msgid "Ramming customization"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:41
+#: src/slic3r/GUI/WipeTowerDialog.cpp:54
 msgid ""
 "Ramming denotes the rapid extrusion just before a tool change in a single-"
 "extruder MM printer. Its purpose is to properly shape the end of the "
@@ -7610,63 +8753,63 @@ msgid ""
 "jams, extruder wheel grinding into filament etc."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:83
+#: src/slic3r/GUI/WipeTowerDialog.cpp:114
 msgid "Total ramming time"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:85
+#: src/slic3r/GUI/WipeTowerDialog.cpp:116
 msgid "Total rammed volume"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:89
+#: src/slic3r/GUI/WipeTowerDialog.cpp:120
 msgid "Ramming line width"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:91
+#: src/slic3r/GUI/WipeTowerDialog.cpp:122
 msgid "Ramming line spacing"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:142
+#: src/slic3r/GUI/WipeTowerDialog.cpp:173
 msgid "Wipe tower - Purging volume adjustment"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:254
+#: src/slic3r/GUI/WipeTowerDialog.cpp:299
 msgid ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:255
+#: src/slic3r/GUI/WipeTowerDialog.cpp:300
 msgid "Extruder changed to"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:263
+#: src/slic3r/GUI/WipeTowerDialog.cpp:308
 msgid "unloaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:264
+#: src/slic3r/GUI/WipeTowerDialog.cpp:309
 msgid "loaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:276
+#: src/slic3r/GUI/WipeTowerDialog.cpp:352
 msgid "Tool #"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:285
+#: src/slic3r/GUI/WipeTowerDialog.cpp:361
 msgid ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:286
+#: src/slic3r/GUI/WipeTowerDialog.cpp:362
 msgid "Volume to purge (mm³) when the filament is being"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:300
+#: src/slic3r/GUI/WipeTowerDialog.cpp:376
 msgid "From"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:365
+#: src/slic3r/GUI/WipeTowerDialog.cpp:442
 msgid ""
 "Switching to simple settings will discard changes done in the advanced "
 "mode!\n"
@@ -7674,25 +8817,26 @@ msgid ""
 "Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:377
+#: src/slic3r/GUI/WipeTowerDialog.cpp:454
 msgid "Show simplified settings"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:377
+#: src/slic3r/GUI/WipeTowerDialog.cpp:454
 msgid "Show advanced settings"
 msgstr ""
 
-#: src/slic3r/GUI/wxExtensions.cpp:627
+#: src/slic3r/GUI/wxExtensions.cpp:642
 #, possible-c-format
 msgid "Switch to the %s mode"
 msgstr ""
 
-#: src/slic3r/GUI/wxExtensions.cpp:628
+#: src/slic3r/GUI/wxExtensions.cpp:643
 #, possible-c-format
 msgid "Current mode is %s"
 msgstr ""
 
-#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:68
+#: src/slic3r/Utils/AstroBox.cpp:69 src/slic3r/Utils/OctoPrint.cpp:69
+#: src/slic3r/Utils/Repetier.cpp:69
 #, possible-c-format
 msgid "Mismatched type of print host: %s"
 msgstr ""
@@ -7731,87 +8875,66 @@ msgstr ""
 msgid "Could not get resources to create a new connection"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
+#: src/slic3r/Utils/FixModelByWin10.cpp:221
 #: src/slic3r/Utils/FixModelByWin10.cpp:359
 msgid "Exporting source model"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
+#: src/slic3r/Utils/FixModelByWin10.cpp:237
 msgid "Failed loading the input model."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
+#: src/slic3r/Utils/FixModelByWin10.cpp:244
 msgid "Repairing model by the Netfabb service"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
+#: src/slic3r/Utils/FixModelByWin10.cpp:250
 msgid "Mesh repair failed."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:378
+#: src/slic3r/Utils/FixModelByWin10.cpp:253
+#: src/slic3r/Utils/FixModelByWin10.cpp:386
 msgid "Loading repaired model"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:263
-#: src/slic3r/Utils/FixModelByWin10.cpp:270
-#: src/slic3r/Utils/FixModelByWin10.cpp:302
+#: src/slic3r/Utils/FixModelByWin10.cpp:265
+#: src/slic3r/Utils/FixModelByWin10.cpp:272
+#: src/slic3r/Utils/FixModelByWin10.cpp:304
 msgid "Saving mesh into the 3MF container failed."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:340
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:341
-msgid "Exporting model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:368
+#: src/slic3r/Utils/FixModelByWin10.cpp:376
 msgid "Export of a temporary 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:383
+#: src/slic3r/Utils/FixModelByWin10.cpp:392
 msgid "Import of the repaired 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:385
+#: src/slic3r/Utils/FixModelByWin10.cpp:394
 msgid "Repaired 3MF file does not contain any object"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:387
+#: src/slic3r/Utils/FixModelByWin10.cpp:396
 msgid "Repaired 3MF file contains more than one object"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:389
+#: src/slic3r/Utils/FixModelByWin10.cpp:398
 msgid "Repaired 3MF file does not contain any volume"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:391
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
 msgid "Repaired 3MF file contains more than one volume"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:400
+#: src/slic3r/Utils/FixModelByWin10.cpp:410
 msgid "Model repair finished"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:406
+#: src/slic3r/Utils/FixModelByWin10.cpp:416
 msgid "Model repair canceled"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:423
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:423
-#: src/slic3r/Utils/FixModelByWin10.cpp:426
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:426
-msgid "Model repair failed:"
-msgstr ""
-
 #: src/slic3r/Utils/FlashAir.cpp:58
 msgid "Upload not enabled on FlashAir card."
 msgstr ""
@@ -7830,37 +8953,64 @@ msgid ""
 "is required."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:83
+#: src/slic3r/Utils/OctoPrint.cpp:87
 msgid "Connection to OctoPrint works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:89
+#: src/slic3r/Utils/OctoPrint.cpp:93
 msgid "Could not connect to OctoPrint"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:91
+#: src/slic3r/Utils/OctoPrint.cpp:95
 msgid "Note: OctoPrint version at least 1.1.0 is required."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:185
-msgid "Connection to Prusa SL1 works correctly."
+#: src/slic3r/Utils/OctoPrint.cpp:192
+msgid "Connection to Prusa SL1 / SL1S works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:191
+#: src/slic3r/Utils/OctoPrint.cpp:198
 msgid "Could not connect to Prusa SLA"
 msgstr ""
 
+#: src/slic3r/Utils/OctoPrint.cpp:236
+msgid "Connection to PrusaLink works correctly."
+msgstr ""
+
+#: src/slic3r/Utils/OctoPrint.cpp:242
+msgid "Could not connect to PrusaLink"
+msgstr ""
+
+#: src/slic3r/Utils/PresetUpdater.cpp:65
+msgid "Copying of file %1% to %2% failed: %3%"
+msgstr ""
+
+#: src/slic3r/Utils/PresetUpdater.cpp:593
+#: src/slic3r/Utils/PresetUpdater.cpp:610
+msgid "Continue and install configuration updates?"
+msgstr ""
+
+#: src/slic3r/Utils/PresetUpdater.cpp:725
+msgid ""
+"Configuration Updates causes a lost of preset modification.\n"
+"So, check unsaved changes and save them if necessary."
+msgstr ""
+
 #: src/slic3r/Utils/PresetUpdater.cpp:727
+msgid "Updater is processing"
+msgstr ""
+
+#: src/slic3r/Utils/PresetUpdater.cpp:756
 #, possible-c-format
 msgid "requires min. %s and max. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:731
+#: src/slic3r/Utils/PresetUpdater.cpp:760
 #, possible-c-format
 msgid "requires min. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:734
+#: src/slic3r/Utils/PresetUpdater.cpp:763
 #, possible-c-format
 msgid "requires max. %s"
 msgstr ""
@@ -7891,31 +9041,82 @@ msgstr ""
 msgid "Open G-code file:"
 msgstr ""
 
-#: src/libslic3r/GCode.cpp:518
-msgid "There is an object with no extrusions on the first layer."
+#: src/slic3r/Utils/Repetier.cpp:84
+msgid "Connection to Repetier works correctly."
 msgstr ""
 
-#: src/libslic3r/GCode.cpp:536
-msgid "Empty layers detected, the output would not be printable."
+#: src/slic3r/Utils/Repetier.cpp:90
+msgid "Could not connect to Repetier"
 msgstr ""
 
-#: src/libslic3r/GCode.cpp:537
-msgid "Print z"
+#: src/slic3r/Utils/Repetier.cpp:92
+msgid "Note: Repetier version at least 0.90.0 is required."
 msgstr ""
 
-#: src/libslic3r/GCode.cpp:538
+#: src/slic3r/Utils/Repetier.cpp:240
+msgid ""
+"HTTP status: %1%\n"
+"Message body: \"%2%\""
+msgstr ""
+
+#: src/slic3r/Utils/Repetier.cpp:247
+msgid ""
+"Parsing of host response failed.\n"
+"Message body: \"%1%\"\n"
+"Error: \"%2%\""
+msgstr ""
+
+#: src/slic3r/Utils/Repetier.cpp:260
+msgid ""
+"Enumeration of host printers failed.\n"
+"Message body: \"%1%\"\n"
+"Error: \"%2%\""
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:521
+msgid "There is an object with no extrusions in the first layer."
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:540
+msgid ""
+"Empty layer detected between heights %1% and %2%. Make sure the object is "
+"printable."
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:543
+msgid "Object name: %1%"
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:544
 msgid ""
 "This is usually caused by negligibly small extrusions or by a faulty model. "
 "Try to repair the model or change its orientation on the bed."
 msgstr ""
 
-#: src/libslic3r/GCode.cpp:1274
+#: src/libslic3r/GCode.cpp:689
+msgid "Filament Start G-code"
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:696
+msgid "Filament End G-code"
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:735
+msgid "Found reserved keyword(s) into custom g-code:"
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:737
+msgid ""
+"This may cause problems in g-code visualization and printing time estimation."
+msgstr ""
+
+#: src/libslic3r/GCode.cpp:1391
 msgid ""
 "Your print is very close to the priming regions. Make sure there is no "
 "collision."
 msgstr ""
 
-#: src/libslic3r/ExtrusionEntity.cpp:324 src/libslic3r/ExtrusionEntity.cpp:360
+#: src/libslic3r/ExtrusionEntity.cpp:326 src/libslic3r/ExtrusionEntity.cpp:362
 msgid "Mixed"
 msgstr ""
 
@@ -7924,13 +9125,31 @@ msgid ""
 "Cannot calculate extrusion width for %1%: Variable \"%2%\" not accessible."
 msgstr ""
 
-#: src/libslic3r/Format/3mf.cpp:1641
+#: src/libslic3r/Format/3mf.cpp:1715
 msgid ""
 "The selected 3mf file has been saved with a newer version of %1% and is not "
 "compatible."
 msgstr ""
 
-#: src/libslic3r/Format/AMF.cpp:958
+#: src/libslic3r/Format/3mf.cpp:1726
+msgid ""
+"The selected 3MF contains FDM supports painted object using a newer version "
+"of PrusaSlicer and is not compatible."
+msgstr ""
+
+#: src/libslic3r/Format/3mf.cpp:1730
+msgid ""
+"The selected 3MF contains seam painted object using a newer version of "
+"PrusaSlicer and is not compatible."
+msgstr ""
+
+#: src/libslic3r/Format/3mf.cpp:1734
+msgid ""
+"The selected 3MF contains multi-material painted object using a newer "
+"version of PrusaSlicer and is not compatible."
+msgstr ""
+
+#: src/libslic3r/Format/AMF.cpp:988
 msgid ""
 "The selected amf file has been saved with a newer version of %1% and is not "
 "compatible."
@@ -8060,117 +9279,113 @@ msgstr ""
 msgid "write calledback failed"
 msgstr ""
 
-#: src/libslic3r/Preset.cpp:1304
-msgid "filament"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1257
+#: src/libslic3r/Print.cpp:445
 msgid "All objects are outside of the print volume."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1260
+#: src/libslic3r/Print.cpp:448
 msgid "The supplied settings will cause an empty print."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1264
+#: src/libslic3r/Print.cpp:452
 msgid "Some objects are too close; your extruder will collide with them."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1266
+#: src/libslic3r/Print.cpp:454
 msgid ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1275
+#: src/libslic3r/Print.cpp:463
 msgid ""
 "Only a single object may be printed at a time in Spiral Vase mode. Either "
 "remove all but the last object, or enable sequential mode by "
 "\"complete_objects\"."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1283
+#: src/libslic3r/Print.cpp:467
 msgid ""
 "The Spiral Vase option can only be used when printing single material "
 "objects."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1296
+#: src/libslic3r/Print.cpp:480
 msgid ""
 "The wipe tower is only supported if all extruders have the same nozzle "
 "diameter and use filaments of the same diameter."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1302
+#: src/libslic3r/Print.cpp:486
 msgid ""
 "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter, "
 "RepRapFirmware and Repetier G-code flavors."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1304
+#: src/libslic3r/Print.cpp:488
 msgid ""
 "The Wipe Tower is currently only supported with the relative extruder "
 "addressing (use_relative_e_distances=1)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1306
+#: src/libslic3r/Print.cpp:490
 msgid "Ooze prevention is currently not supported with the wipe tower enabled."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1308
+#: src/libslic3r/Print.cpp:492
 msgid ""
 "The Wipe Tower currently does not support volumetric E (use_volumetric_e=0)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1310
+#: src/libslic3r/Print.cpp:494
 msgid ""
 "The Wipe Tower is currently not supported for multimaterial sequential "
 "prints."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1331
+#: src/libslic3r/Print.cpp:515
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they have equal "
 "layer heights"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1333
+#: src/libslic3r/Print.cpp:517
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "over an equal number of raft layers"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1335
+#: src/libslic3r/Print.cpp:520
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1337
+#: src/libslic3r/Print.cpp:522
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1379
+#: src/libslic3r/Print.cpp:535
 msgid ""
 "The Wipe tower is only supported if all objects have the same variable layer "
 "height"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1405
+#: src/libslic3r/Print.cpp:557
 msgid ""
 "One or more object were assigned an extruder that the printer does not have."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1418
+#: src/libslic3r/Print.cpp:570
 msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1421
+#: src/libslic3r/Print.cpp:573
 msgid "Excessive %1%=%2% mm to be printable with a nozzle diameter %3% mm"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1432
+#: src/libslic3r/Print.cpp:584
 msgid ""
 "Printing with multiple extruders of differing nozzle diameters. If support "
 "is to be printed with the current extruder (support_material_extruder == 0 "
@@ -8178,13 +9393,13 @@ msgid ""
 "same diameter."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1440
+#: src/libslic3r/Print.cpp:592
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers "
 "need to be synchronized with the object layers."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1444
+#: src/libslic3r/Print.cpp:596
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only if they are "
 "printed with the current extruder without triggering a tool change. (both "
@@ -8192,197 +9407,205 @@ msgid ""
 "set to 0)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1466
+#: src/libslic3r/Print.cpp:632
 msgid "First layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1471
+#: src/libslic3r/Print.cpp:637
 msgid "Layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1630
+#: src/libslic3r/Print.cpp:791
 msgid "Infilling layers"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1656
-msgid "Generating skirt"
+#: src/libslic3r/Print.cpp:813
+msgid "Generating skirt and brim"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1665
-msgid "Generating brim"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1691
+#: src/libslic3r/Print.cpp:861
 msgid "Exporting G-code"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1695
+#: src/libslic3r/Print.cpp:865
 msgid "Generating G-code"
 msgstr ""
 
-#: src/libslic3r/SLA/Pad.cpp:532
+#: src/libslic3r/SLA/Pad.cpp:533
 msgid "Pad brim size is too small for the current configuration."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:630
+#: src/libslic3r/SLAPrint.cpp:628
 msgid ""
 "Cannot proceed without support points! Add support points or disable support "
 "generation."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:642
+#: src/libslic3r/SLAPrint.cpp:640
 msgid ""
 "Elevation is too low for object. Use the \"Pad around object\" feature to "
 "print the object without elevation."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:648
+#: src/libslic3r/SLAPrint.cpp:646
 msgid ""
 "The endings of the support pillars will be deployed on the gap between the "
 "object and the pad. 'Support base safety distance' has to be greater than "
 "the 'Pad object gap' parameter to avoid this."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:663
+#: src/libslic3r/SLAPrint.cpp:661
 msgid "Exposition time is out of printer profile bounds."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:670
+#: src/libslic3r/SLAPrint.cpp:668
 msgid "Initial exposition time is out of printer profile bounds."
 msgstr ""
 
-#: src/libslic3r/SLAPrint.cpp:786
+#: src/libslic3r/SLAPrint.cpp:784
 msgid "Slicing done"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:44
+#: src/libslic3r/SLAPrintSteps.cpp:45
 msgid "Hollowing model"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:45
+#: src/libslic3r/SLAPrintSteps.cpp:46
 msgid "Drilling holes into model."
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:46
+#: src/libslic3r/SLAPrintSteps.cpp:47
 msgid "Slicing model"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:47 src/libslic3r/SLAPrintSteps.cpp:359
+#: src/libslic3r/SLAPrintSteps.cpp:48 src/libslic3r/SLAPrintSteps.cpp:632
 msgid "Generating support points"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:48
+#: src/libslic3r/SLAPrintSteps.cpp:49
 msgid "Generating support tree"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:49
+#: src/libslic3r/SLAPrintSteps.cpp:50
 msgid "Generating pad"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:50
+#: src/libslic3r/SLAPrintSteps.cpp:51
 msgid "Slicing supports"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:65
+#: src/libslic3r/SLAPrintSteps.cpp:66
 msgid "Merging slices and calculating statistics"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:66
+#: src/libslic3r/SLAPrintSteps.cpp:67
 msgid "Rasterizing layers"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:192
+#: src/libslic3r/SLAPrintSteps.cpp:426
 msgid "Too many overlapping holes."
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:201
+#: src/libslic3r/SLAPrintSteps.cpp:433
+msgid ""
+"Mesh to be hollowed is not suitable for hollowing (does not bound a volume)."
+msgstr ""
+
+#: src/libslic3r/SLAPrintSteps.cpp:441
+msgid "Unable to drill the current configuration of holes into the model."
+msgstr ""
+
+#: src/libslic3r/SLAPrintSteps.cpp:461
 msgid ""
 "Drilling holes into the mesh failed. This is usually caused by broken model. "
 "Try to fix it first."
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:247
+#: src/libslic3r/SLAPrintSteps.cpp:467
+msgid "Failed to drill some holes into the model"
+msgstr ""
+
+#: src/libslic3r/SLAPrintSteps.cpp:511
 msgid ""
 "Slicing had to be stopped due to an internal error: Inconsistent slice index."
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:411 src/libslic3r/SLAPrintSteps.cpp:420
-#: src/libslic3r/SLAPrintSteps.cpp:459
+#: src/libslic3r/SLAPrintSteps.cpp:684 src/libslic3r/SLAPrintSteps.cpp:693
+#: src/libslic3r/SLAPrintSteps.cpp:731
 msgid "Visualizing supports"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:451
+#: src/libslic3r/SLAPrintSteps.cpp:723
 msgid "No pad can be generated for this model with the current configuration"
 msgstr ""
 
-#: src/libslic3r/SLAPrintSteps.cpp:619
+#: src/libslic3r/SLAPrintSteps.cpp:847
 msgid ""
 "There are unprintable objects. Try to adjust support settings to make the "
 "objects printable."
 msgstr ""
 
-#: src/libslic3r/PrintBase.cpp:77
+#: src/libslic3r/PrintBase.cpp:78
 msgid "Failed processing of the output_filename_format template."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:43 src/libslic3r/PrintConfig.cpp:44
+#: src/libslic3r/PrintConfig.cpp:213 src/libslic3r/PrintConfig.cpp:214
 msgid "Printer technology"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:51
+#: src/libslic3r/PrintConfig.cpp:221
 msgid "Bed shape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:56
+#: src/libslic3r/PrintConfig.cpp:226
 msgid "Bed custom texture"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:61
+#: src/libslic3r/PrintConfig.cpp:231
 msgid "Bed custom model"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:66
+#: src/libslic3r/PrintConfig.cpp:236
+msgid "Elephant foot compensation"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:238
+msgid ""
+"The first layer will be shrunk in the XY plane by the configured value to "
+"compensate for the 1st layer squish aka an Elephant Foot effect."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:246
 msgid "G-code thumbnails"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:67
+#: src/libslic3r/PrintConfig.cpp:247
 msgid ""
-"Picture sizes to be stored into a .gcode and .sl1 files, in the following "
-"format: \"XxY, XxY, ...\""
+"Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the "
+"following format: \"XxY, XxY, ...\""
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:75
+#: src/libslic3r/PrintConfig.cpp:255
 msgid ""
 "This setting controls the height (and thus the total number) of the slices/"
 "layers. Thinner layers give better accuracy but take more time to print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:82
+#: src/libslic3r/PrintConfig.cpp:262
 msgid "Max print height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:83
+#: src/libslic3r/PrintConfig.cpp:263
 msgid ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:91
-msgid "Slice gap closing radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:93
-msgid ""
-"Cracks smaller than 2x gap closing radius are being filled during the "
-"triangle mesh slicing. The gap closing operation may reduce the final print "
-"resolution, therefore it is advisable to keep the value reasonably low."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:101
+#: src/libslic3r/PrintConfig.cpp:271
 msgid "Hostname, IP or URL"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:102
+#: src/libslic3r/PrintConfig.cpp:272
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field should contain "
 "the hostname, IP address or URL of the printer host instance. Print host "
@@ -8391,77 +9614,78 @@ msgid ""
 "password@your-octopi-address/"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:110
+#: src/libslic3r/PrintConfig.cpp:281
 msgid "API Key / Password"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:111
+#: src/libslic3r/PrintConfig.cpp:282
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field should contain "
 "the API Key or the password required for authentication."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:118
+#: src/libslic3r/PrintConfig.cpp:290
 msgid "Name of the printer"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:125
+#: src/libslic3r/PrintConfig.cpp:298
 msgid ""
 "Custom CA certificate file can be specified for HTTPS OctoPrint connections, "
 "in crt/pem format. If left blank, the default OS CA certificate repository "
 "is used."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:131
-msgid "Elephant foot compensation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid ""
-"The first layer will be shrunk in the XY plane by the configured value to "
-"compensate for the 1st layer squish aka an Elephant Foot effect."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:149
+#: src/libslic3r/PrintConfig.cpp:314
 msgid "Password"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Printer preset name"
+#: src/libslic3r/PrintConfig.cpp:322
+msgid "Ignore HTTPS certificate revocation checks"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:156
-msgid "Related printer preset name"
+#: src/libslic3r/PrintConfig.cpp:323
+msgid ""
+"Ignore HTTPS certificate revocation checks in case of missing or offline "
+"distribution points. One may want to enable this option for self signed "
+"certificates if connection fails."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:161
+#: src/libslic3r/PrintConfig.cpp:330
+msgid "Printer preset names"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:331
+msgid "Names of presets related to the physical printer"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:336
 msgid "Authorization Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:166
+#: src/libslic3r/PrintConfig.cpp:341
 msgid "API key"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:167
+#: src/libslic3r/PrintConfig.cpp:342
 msgid "HTTP digest"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:180
+#: src/libslic3r/PrintConfig.cpp:362
 msgid "Avoid crossing perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:181
+#: src/libslic3r/PrintConfig.cpp:363
 msgid ""
 "Optimize travel moves in order to minimize the crossing of perimeters. This "
 "is mostly useful with Bowden extruders which suffer from oozing. This "
 "feature slows down both the print and the G-code generation."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:370
 msgid "Avoid crossing perimeters - Max detour length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:190
+#: src/libslic3r/PrintConfig.cpp:372
 msgid ""
 "The maximum detour length for avoid crossing perimeters. If the detour is "
 "longer than this value, avoid crossing perimeters is not applied for this "
@@ -8469,36 +9693,36 @@ msgid ""
 "as percentage (for example 50%) of a direct travel path."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:193
+#: src/libslic3r/PrintConfig.cpp:375
 msgid "mm or % (zero to disable)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:199 src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:381 src/libslic3r/PrintConfig.cpp:2736
 msgid "Other layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:200
+#: src/libslic3r/PrintConfig.cpp:382
 msgid ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:203
+#: src/libslic3r/PrintConfig.cpp:385
 msgid "Bed temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:210
+#: src/libslic3r/PrintConfig.cpp:392
 msgid ""
 "This custom code is inserted at every layer change, right before the Z move. "
 "Note that you can use placeholder variables for all Slic3r settings as well "
 "as [layer_num] and [layer_z]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:220
+#: src/libslic3r/PrintConfig.cpp:402
 msgid "Between objects G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:221
+#: src/libslic3r/PrintConfig.cpp:403
 msgid ""
 "This code is inserted between objects when using sequential printing. By "
 "default extruder and bed temperature are reset using non-wait command; "
@@ -8508,81 +9732,82 @@ msgid ""
 "S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:232
+#: src/libslic3r/PrintConfig.cpp:414
 msgid "Number of solid layers to generate on bottom surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:233
+#: src/libslic3r/PrintConfig.cpp:415
 msgid "Bottom solid layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:241
+#: src/libslic3r/PrintConfig.cpp:423
 msgid ""
 "The number of bottom solid layers is increased above bottom_solid_layers if "
 "necessary to satisfy minimum thickness of bottom shell."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:243
+#: src/libslic3r/PrintConfig.cpp:425
 msgid "Minimum bottom shell thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:249
+#: src/libslic3r/PrintConfig.cpp:431
 msgid "Bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:250
+#: src/libslic3r/PrintConfig.cpp:432
 msgid ""
 "This is the acceleration your printer will use for bridges. Set zero to "
 "disable acceleration control for bridges."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:252 src/libslic3r/PrintConfig.cpp:420
-#: src/libslic3r/PrintConfig.cpp:965 src/libslic3r/PrintConfig.cpp:1168
-#: src/libslic3r/PrintConfig.cpp:1449 src/libslic3r/PrintConfig.cpp:1498
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1701
+#: src/libslic3r/PrintConfig.cpp:434 src/libslic3r/PrintConfig.cpp:605
+#: src/libslic3r/PrintConfig.cpp:1150 src/libslic3r/PrintConfig.cpp:1159
+#: src/libslic3r/PrintConfig.cpp:1348 src/libslic3r/PrintConfig.cpp:1638
+#: src/libslic3r/PrintConfig.cpp:1689 src/libslic3r/PrintConfig.cpp:1700
+#: src/libslic3r/PrintConfig.cpp:1710 src/libslic3r/PrintConfig.cpp:1906
 msgid "mm/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:258
+#: src/libslic3r/PrintConfig.cpp:440
 msgid "Bridging angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:260
+#: src/libslic3r/PrintConfig.cpp:442
 msgid ""
 "Bridging angle override. If left to zero, the bridging angle will be "
 "calculated automatically. Otherwise the provided angle will be used for all "
 "bridges. Use 180° for zero angle."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:877
-#: src/libslic3r/PrintConfig.cpp:1942 src/libslic3r/PrintConfig.cpp:1952
-#: src/libslic3r/PrintConfig.cpp:2210 src/libslic3r/PrintConfig.cpp:2365
-#: src/libslic3r/PrintConfig.cpp:2564 src/libslic3r/PrintConfig.cpp:3065
-#: src/libslic3r/PrintConfig.cpp:3186
+#: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:1062
+#: src/libslic3r/PrintConfig.cpp:2184 src/libslic3r/PrintConfig.cpp:2194
+#: src/libslic3r/PrintConfig.cpp:2483 src/libslic3r/PrintConfig.cpp:2721
+#: src/libslic3r/PrintConfig.cpp:2936 src/libslic3r/PrintConfig.cpp:3445
+#: src/libslic3r/PrintConfig.cpp:3566
 msgid "°"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:269
+#: src/libslic3r/PrintConfig.cpp:451
 msgid "Bridges fan speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:270
+#: src/libslic3r/PrintConfig.cpp:452
 msgid "This fan speed is enforced during all bridges and overhangs."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:271 src/libslic3r/PrintConfig.cpp:889
-#: src/libslic3r/PrintConfig.cpp:1337 src/libslic3r/PrintConfig.cpp:1516
-#: src/libslic3r/PrintConfig.cpp:1579 src/libslic3r/PrintConfig.cpp:1834
-#: src/libslic3r/PrintConfig.cpp:2742 src/libslic3r/PrintConfig.cpp:2979
-#: src/libslic3r/PrintConfig.cpp:3105
+#: src/libslic3r/PrintConfig.cpp:453 src/libslic3r/PrintConfig.cpp:1074
+#: src/libslic3r/PrintConfig.cpp:1526 src/libslic3r/PrintConfig.cpp:1718
+#: src/libslic3r/PrintConfig.cpp:1781 src/libslic3r/PrintConfig.cpp:2029
+#: src/libslic3r/PrintConfig.cpp:2076 src/libslic3r/PrintConfig.cpp:3122
+#: src/libslic3r/PrintConfig.cpp:3359 src/libslic3r/PrintConfig.cpp:3485
 msgid "%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:278
+#: src/libslic3r/PrintConfig.cpp:460
 msgid "Bridge flow ratio"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:280
+#: src/libslic3r/PrintConfig.cpp:462
 msgid ""
 "This factor affects the amount of plastic for bridging. You can decrease it "
 "slightly to pull the extrudates and prevent sagging, although default "
@@ -8590,118 +9815,121 @@ msgid ""
 "before tweaking this."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:290
+#: src/libslic3r/PrintConfig.cpp:472
 msgid "Bridges"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:292
+#: src/libslic3r/PrintConfig.cpp:474
 msgid "Speed for printing bridges."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:293 src/libslic3r/PrintConfig.cpp:696
-#: src/libslic3r/PrintConfig.cpp:704 src/libslic3r/PrintConfig.cpp:713
-#: src/libslic3r/PrintConfig.cpp:721 src/libslic3r/PrintConfig.cpp:748
-#: src/libslic3r/PrintConfig.cpp:767 src/libslic3r/PrintConfig.cpp:1104
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1356
-#: src/libslic3r/PrintConfig.cpp:1432 src/libslic3r/PrintConfig.cpp:1466
-#: src/libslic3r/PrintConfig.cpp:1478 src/libslic3r/PrintConfig.cpp:1488
-#: src/libslic3r/PrintConfig.cpp:1538 src/libslic3r/PrintConfig.cpp:1597
-#: src/libslic3r/PrintConfig.cpp:1731 src/libslic3r/PrintConfig.cpp:1909
-#: src/libslic3r/PrintConfig.cpp:1918 src/libslic3r/PrintConfig.cpp:2344
-#: src/libslic3r/PrintConfig.cpp:2471
+#: src/libslic3r/PrintConfig.cpp:475 src/libslic3r/PrintConfig.cpp:881
+#: src/libslic3r/PrintConfig.cpp:889 src/libslic3r/PrintConfig.cpp:898
+#: src/libslic3r/PrintConfig.cpp:906 src/libslic3r/PrintConfig.cpp:933
+#: src/libslic3r/PrintConfig.cpp:952 src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1463 src/libslic3r/PrintConfig.cpp:1545
+#: src/libslic3r/PrintConfig.cpp:1621 src/libslic3r/PrintConfig.cpp:1655
+#: src/libslic3r/PrintConfig.cpp:1667 src/libslic3r/PrintConfig.cpp:1677
+#: src/libslic3r/PrintConfig.cpp:1740 src/libslic3r/PrintConfig.cpp:1799
+#: src/libslic3r/PrintConfig.cpp:1936 src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2160 src/libslic3r/PrintConfig.cpp:2686
+#: src/libslic3r/PrintConfig.cpp:2834 src/libslic3r/PrintConfig.cpp:2844
 msgid "mm/s"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:300
+#: src/libslic3r/PrintConfig.cpp:482
 msgid "Brim width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:302
+#: src/libslic3r/PrintConfig.cpp:484
 msgid ""
 "Horizontal width of the brim that will be printed around each object on the "
-"first layer."
+"first layer.When raft is used, no brim is generated (use "
+"raft_first_layer_expansion)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:309
+#: src/libslic3r/PrintConfig.cpp:493
 msgid "Brim type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:311
+#: src/libslic3r/PrintConfig.cpp:495
 msgid ""
 "The places where the brim will be printed around each object on the first "
 "layer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:317
+#: src/libslic3r/PrintConfig.cpp:501
 msgid "No brim"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:318
+#: src/libslic3r/PrintConfig.cpp:502
 msgid "Outer brim only"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:319
+#: src/libslic3r/PrintConfig.cpp:503
 msgid "Inner brim only"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:320
+#: src/libslic3r/PrintConfig.cpp:504
 msgid "Outer and inner brim"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:325
-msgid "Brim offset"
+#: src/libslic3r/PrintConfig.cpp:509
+msgid "Brim separation gap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:327
-msgid "The offset of the brim from the printed object."
+#: src/libslic3r/PrintConfig.cpp:511
+msgid ""
+"Offset of brim from the printed object. The offset is applied after the "
+"elephant foot compensation."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:333
+#: src/libslic3r/PrintConfig.cpp:518
 msgid "Clip multi-part objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:519
 msgid ""
 "When printing multi-material objects, this settings will make Slic3r to clip "
 "the overlapping object parts one by the other (2nd part will be clipped by "
 "the 1st, 3rd part will be clipped by the 1st and 2nd etc)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:341
+#: src/libslic3r/PrintConfig.cpp:526
 msgid "Colorprint height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:342
+#: src/libslic3r/PrintConfig.cpp:527
 msgid "Heights at which a filament change is to occur."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:352
+#: src/libslic3r/PrintConfig.cpp:537
 msgid "Compatible printers condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:353
+#: src/libslic3r/PrintConfig.cpp:538
 msgid ""
 "A boolean expression using the configuration values of an active printer "
 "profile. If this expression evaluates to true, this profile is considered "
 "compatible with the active printer profile."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:367
+#: src/libslic3r/PrintConfig.cpp:552
 msgid "Compatible print profiles condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:368
+#: src/libslic3r/PrintConfig.cpp:553
 msgid ""
 "A boolean expression using the configuration values of an active print "
 "profile. If this expression evaluates to true, this profile is considered "
 "compatible with the active print profile."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:385
+#: src/libslic3r/PrintConfig.cpp:570
 msgid "Complete individual objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:386
+#: src/libslic3r/PrintConfig.cpp:571
 msgid ""
 "When printing multiple objects or copies, this feature will complete each "
 "object before moving onto next one (and starting it from its bottom layer). "
@@ -8709,97 +9937,97 @@ msgid ""
 "warn and prevent you from extruder collisions, but beware."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:394
+#: src/libslic3r/PrintConfig.cpp:579
 msgid "Enable auto cooling"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:395
+#: src/libslic3r/PrintConfig.cpp:580
 msgid ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:400
+#: src/libslic3r/PrintConfig.cpp:585
 msgid "Cooling tube position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:401
+#: src/libslic3r/PrintConfig.cpp:586
 msgid "Distance of the center-point of the cooling tube from the extruder tip."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:408
+#: src/libslic3r/PrintConfig.cpp:593
 msgid "Cooling tube length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:409
+#: src/libslic3r/PrintConfig.cpp:594
 msgid "Length of the cooling tube to limit space for cooling moves inside it."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:417
+#: src/libslic3r/PrintConfig.cpp:602
 msgid ""
 "This is the acceleration your printer will be reset to after the role-"
 "specific acceleration values are used (perimeter/infill). Set zero to "
 "prevent resetting acceleration at all."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:426
+#: src/libslic3r/PrintConfig.cpp:611
 msgid "Default filament profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:427
+#: src/libslic3r/PrintConfig.cpp:612
 msgid ""
 "Default filament profile associated with the current printer profile. On "
 "selection of the current printer profile, this filament profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:433
+#: src/libslic3r/PrintConfig.cpp:618
 msgid "Default print profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:434 src/libslic3r/PrintConfig.cpp:2909
-#: src/libslic3r/PrintConfig.cpp:2920
+#: src/libslic3r/PrintConfig.cpp:619 src/libslic3r/PrintConfig.cpp:3289
+#: src/libslic3r/PrintConfig.cpp:3300
 msgid ""
 "Default print profile associated with the current printer profile. On "
 "selection of the current printer profile, this print profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:440
+#: src/libslic3r/PrintConfig.cpp:625
 msgid "Disable fan for the first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:441
+#: src/libslic3r/PrintConfig.cpp:626
 msgid ""
 "You can set this to a positive value to disable fan at all during the first "
 "layers, so that it does not make adhesion worse."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:450
+#: src/libslic3r/PrintConfig.cpp:635
 msgid "Don't support bridges"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:452
+#: src/libslic3r/PrintConfig.cpp:637
 msgid ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:458
+#: src/libslic3r/PrintConfig.cpp:643
 msgid "Distance between copies"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:459
+#: src/libslic3r/PrintConfig.cpp:644
 msgid "Distance used for the auto-arrange feature of the plater."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:467
+#: src/libslic3r/PrintConfig.cpp:652
 msgid ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all PrusaSlicer settings."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:477
+#: src/libslic3r/PrintConfig.cpp:662
 msgid ""
 "This end procedure is inserted at the end of the output file, before the "
 "printer end gcode (and before any toolchange from this filament in case of "
@@ -8808,70 +10036,72 @@ msgid ""
 "in extruder order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:488
+#: src/libslic3r/PrintConfig.cpp:673
 msgid "Ensure vertical shell thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:490
+#: src/libslic3r/PrintConfig.cpp:675
 msgid ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:496
+#: src/libslic3r/PrintConfig.cpp:681
 msgid "Top fill pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:498
+#: src/libslic3r/PrintConfig.cpp:683
 msgid ""
 "Fill pattern for top infill. This only affects the top visible layer, and "
 "not its adjacent solid shells."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:508 src/libslic3r/PrintConfig.cpp:943
-#: src/libslic3r/PrintConfig.cpp:2325
+#: src/libslic3r/PrintConfig.cpp:693 src/libslic3r/PrintConfig.cpp:1128
+#: src/libslic3r/PrintConfig.cpp:2651 src/libslic3r/PrintConfig.cpp:2668
 msgid "Rectilinear"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:509
+#: src/libslic3r/PrintConfig.cpp:694
 msgid "Monotonic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:510 src/libslic3r/PrintConfig.cpp:944
+#: src/libslic3r/PrintConfig.cpp:695 src/libslic3r/PrintConfig.cpp:1129
 msgid "Aligned Rectilinear"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:511 src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:696 src/libslic3r/PrintConfig.cpp:1135
+#: src/libslic3r/PrintConfig.cpp:2669
 msgid "Concentric"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:512 src/libslic3r/PrintConfig.cpp:954
+#: src/libslic3r/PrintConfig.cpp:697 src/libslic3r/PrintConfig.cpp:1139
 msgid "Hilbert Curve"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:513 src/libslic3r/PrintConfig.cpp:955
+#: src/libslic3r/PrintConfig.cpp:698 src/libslic3r/PrintConfig.cpp:1140
 msgid "Archimedean Chords"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:514 src/libslic3r/PrintConfig.cpp:956
+#: src/libslic3r/PrintConfig.cpp:699 src/libslic3r/PrintConfig.cpp:1141
 msgid "Octagram Spiral"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:520
+#: src/libslic3r/PrintConfig.cpp:705
 msgid "Bottom fill pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:707
 msgid ""
 "Fill pattern for bottom infill. This only affects the bottom external "
 "visible layer, and not its adjacent solid shells."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:531 src/libslic3r/PrintConfig.cpp:542
+#: src/libslic3r/PrintConfig.cpp:716 src/libslic3r/PrintConfig.cpp:727
+#: src/libslic3r/PrintConfig.cpp:1247
 msgid "External perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:533
+#: src/libslic3r/PrintConfig.cpp:718
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for external "
 "perimeters. If left zero, default extrusion width will be used if set, "
@@ -8879,43 +10109,44 @@ msgid ""
 "(for example 200%), it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:536 src/libslic3r/PrintConfig.cpp:646
-#: src/libslic3r/PrintConfig.cpp:987 src/libslic3r/PrintConfig.cpp:1000
-#: src/libslic3r/PrintConfig.cpp:1193 src/libslic3r/PrintConfig.cpp:1248
-#: src/libslic3r/PrintConfig.cpp:1274 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:2050 src/libslic3r/PrintConfig.cpp:2199
-#: src/libslic3r/PrintConfig.cpp:2267 src/libslic3r/PrintConfig.cpp:2428
+#: src/libslic3r/PrintConfig.cpp:721 src/libslic3r/PrintConfig.cpp:831
+#: src/libslic3r/PrintConfig.cpp:1181 src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1428 src/libslic3r/PrintConfig.cpp:1454
+#: src/libslic3r/PrintConfig.cpp:1926 src/libslic3r/PrintConfig.cpp:2299
+#: src/libslic3r/PrintConfig.cpp:2472 src/libslic3r/PrintConfig.cpp:2559
+#: src/libslic3r/PrintConfig.cpp:2791
 msgid "mm or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:544
+#: src/libslic3r/PrintConfig.cpp:729
 msgid ""
 "This separate setting will affect the speed of external perimeters (the "
 "visible ones). If expressed as percentage (for example: 80%) it will be "
 "calculated on the perimeters speed setting above. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:547 src/libslic3r/PrintConfig.cpp:1009
-#: src/libslic3r/PrintConfig.cpp:2009 src/libslic3r/PrintConfig.cpp:2061
-#: src/libslic3r/PrintConfig.cpp:2311 src/libslic3r/PrintConfig.cpp:2441
+#: src/libslic3r/PrintConfig.cpp:732 src/libslic3r/PrintConfig.cpp:1201
+#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:2258
+#: src/libslic3r/PrintConfig.cpp:2310 src/libslic3r/PrintConfig.cpp:2637
+#: src/libslic3r/PrintConfig.cpp:2804
 msgid "mm/s or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:554
+#: src/libslic3r/PrintConfig.cpp:739
 msgid "External perimeters first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:556
+#: src/libslic3r/PrintConfig.cpp:741
 msgid ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:562
+#: src/libslic3r/PrintConfig.cpp:747
 msgid "Extra perimeters if needed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:564
+#: src/libslic3r/PrintConfig.cpp:749
 #, possible-c-format
 msgid ""
 "Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
@@ -8923,14 +10154,14 @@ msgid ""
 "is supported."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:574
+#: src/libslic3r/PrintConfig.cpp:759
 msgid ""
 "The extruder to use (unless more specific extruder settings are specified). "
 "This value overrides perimeter and infill extruders, but not the support "
 "extruders."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:586
+#: src/libslic3r/PrintConfig.cpp:771
 msgid ""
 "Set this to the vertical distance between your nozzle tip and (usually) the "
 "X carriage rods. In other words, this is the height of the clearance "
@@ -8938,26 +10169,26 @@ msgid ""
 "extruder can peek before colliding with other printed objects."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:597
+#: src/libslic3r/PrintConfig.cpp:782
 msgid ""
 "Set this to the clearance radius around your extruder. If the extruder is "
 "not centered, choose the largest value for safety. This setting is used to "
 "check for collisions and to display the graphical preview in the plater."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:607
+#: src/libslic3r/PrintConfig.cpp:792
 msgid "Extruder Color"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:608 src/libslic3r/PrintConfig.cpp:670
+#: src/libslic3r/PrintConfig.cpp:793 src/libslic3r/PrintConfig.cpp:855
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:614
+#: src/libslic3r/PrintConfig.cpp:799
 msgid "Extruder offset"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:615
+#: src/libslic3r/PrintConfig.cpp:800
 msgid ""
 "If your firmware doesn't handle the extruder displacement you need the G-"
 "code to take it into account. This option lets you specify the displacement "
@@ -8965,21 +10196,21 @@ msgid ""
 "coordinates (they will be subtracted from the XY coordinate)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:624
+#: src/libslic3r/PrintConfig.cpp:809
 msgid "Extrusion axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:625
+#: src/libslic3r/PrintConfig.cpp:810
 msgid ""
 "Use this option to set the axis letter associated to your printer's extruder "
 "(usually E but some printers use A)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:815
 msgid "Extrusion multiplier"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:631
+#: src/libslic3r/PrintConfig.cpp:816
 msgid ""
 "This factor changes the amount of flow proportionally. You may need to tweak "
 "this setting to get nice surface finish and correct single wall widths. "
@@ -8987,11 +10218,11 @@ msgid ""
 "more, check filament diameter and your firmware E steps."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:640
+#: src/libslic3r/PrintConfig.cpp:825
 msgid "Default extrusion width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:642
+#: src/libslic3r/PrintConfig.cpp:827
 msgid ""
 "Set this to a non-zero value to allow a manual extrusion width. If left to "
 "zero, Slic3r derives extrusion widths from the nozzle diameter (see the "
@@ -9000,123 +10231,123 @@ msgid ""
 "height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:653
+#: src/libslic3r/PrintConfig.cpp:838
 msgid "Keep fan always on"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:654
+#: src/libslic3r/PrintConfig.cpp:839
 msgid ""
 "If this is enabled, fan will never be disabled and will be kept running at "
 "least at its minimum speed. Useful for PLA, harmful for ABS."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:659
+#: src/libslic3r/PrintConfig.cpp:844
 msgid "Enable fan if layer print time is below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:660
+#: src/libslic3r/PrintConfig.cpp:845
 msgid ""
 "If layer print time is estimated below this number of seconds, fan will be "
 "enabled and its speed will be calculated by interpolating the minimum and "
 "maximum speeds."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:662 src/libslic3r/PrintConfig.cpp:1997
+#: src/libslic3r/PrintConfig.cpp:847 src/libslic3r/PrintConfig.cpp:2246
 msgid "approximate seconds"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:669
+#: src/libslic3r/PrintConfig.cpp:854
 msgid "Color"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:675
+#: src/libslic3r/PrintConfig.cpp:860
 msgid "Filament notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:676
+#: src/libslic3r/PrintConfig.cpp:861
 msgid "You can put your notes regarding the filament here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:684 src/libslic3r/PrintConfig.cpp:1544
+#: src/libslic3r/PrintConfig.cpp:869 src/libslic3r/PrintConfig.cpp:1746
 msgid "Max volumetric speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:870
 msgid ""
 "Maximum volumetric speed allowed for this filament. Limits the maximum "
 "volumetric speed of a print to the minimum of print and filament volumetric "
 "speed. Set to zero for no limit."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:694
+#: src/libslic3r/PrintConfig.cpp:879
 msgid "Loading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:695
+#: src/libslic3r/PrintConfig.cpp:880
 msgid "Speed used for loading the filament on the wipe tower."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:702
+#: src/libslic3r/PrintConfig.cpp:887
 msgid "Loading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:703
+#: src/libslic3r/PrintConfig.cpp:888
 msgid "Speed used at the very beginning of loading phase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:710
+#: src/libslic3r/PrintConfig.cpp:895
 msgid "Unloading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:711
+#: src/libslic3r/PrintConfig.cpp:896
 msgid ""
 "Speed used for unloading the filament on the wipe tower (does not affect  "
 "initial part of unloading just after ramming)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:719
+#: src/libslic3r/PrintConfig.cpp:904
 msgid "Unloading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:720
+#: src/libslic3r/PrintConfig.cpp:905
 msgid ""
 "Speed used for unloading the tip of the filament immediately after ramming."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:727
+#: src/libslic3r/PrintConfig.cpp:912
 msgid "Delay after unloading"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:728
+#: src/libslic3r/PrintConfig.cpp:913
 msgid ""
 "Time to wait after the filament is unloaded. May help to get reliable "
 "toolchanges with flexible materials that may need more time to shrink to "
 "original dimensions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:737
+#: src/libslic3r/PrintConfig.cpp:922
 msgid "Number of cooling moves"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:738
+#: src/libslic3r/PrintConfig.cpp:923
 msgid ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
 "Specify desired number of these moves."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:931
 msgid "Speed of the first cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:747
+#: src/libslic3r/PrintConfig.cpp:932
 msgid "Cooling moves are gradually accelerating beginning at this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:754
+#: src/libslic3r/PrintConfig.cpp:939
 msgid "Minimal purge on wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:755
+#: src/libslic3r/PrintConfig.cpp:940
 msgid ""
 "After a tool change, the exact position of the newly loaded filament inside "
 "the nozzle may not be known, and the filament pressure is likely not yet "
@@ -9125,63 +10356,63 @@ msgid ""
 "to produce successive infill or sacrificial object extrusions reliably."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:759
+#: src/libslic3r/PrintConfig.cpp:944
 msgid "mm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:765
+#: src/libslic3r/PrintConfig.cpp:950
 msgid "Speed of the last cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:766
+#: src/libslic3r/PrintConfig.cpp:951
 msgid "Cooling moves are gradually accelerating towards this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:773
+#: src/libslic3r/PrintConfig.cpp:958
 msgid "Filament load time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:774
+#: src/libslic3r/PrintConfig.cpp:959
 msgid ""
 "Time for the printer firmware (or the Multi Material Unit 2.0) to load a new "
 "filament during a tool change (when executing the T code). This time is "
 "added to the total print time by the G-code time estimator."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:781
+#: src/libslic3r/PrintConfig.cpp:966
 msgid "Ramming parameters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:782
+#: src/libslic3r/PrintConfig.cpp:967
 msgid ""
 "This string is edited by RammingDialog and contains ramming specific "
 "parameters."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:788
+#: src/libslic3r/PrintConfig.cpp:973
 msgid "Filament unload time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:789
+#: src/libslic3r/PrintConfig.cpp:974
 msgid ""
 "Time for the printer firmware (or the Multi Material Unit 2.0) to unload a "
 "filament during a tool change (when executing the T code). This time is "
 "added to the total print time by the G-code time estimator."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:797
+#: src/libslic3r/PrintConfig.cpp:982
 msgid ""
 "Enter your filament diameter here. Good precision is required, so use a "
 "caliper and do multiple measurements along the filament, then compute the "
 "average."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:804 src/libslic3r/PrintConfig.cpp:2820
-#: src/libslic3r/PrintConfig.cpp:2821
+#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:3200
+#: src/libslic3r/PrintConfig.cpp:3201
 msgid "Density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:805
+#: src/libslic3r/PrintConfig.cpp:990
 msgid ""
 "Enter your filament density here. This is only for statistical information. "
 "A decent way is to weigh a known length of filament and compute the ratio of "
@@ -9189,41 +10420,41 @@ msgid ""
 "displacement."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:808
+#: src/libslic3r/PrintConfig.cpp:993
 msgid "g/cm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:813
+#: src/libslic3r/PrintConfig.cpp:998
 msgid "Filament type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:814
+#: src/libslic3r/PrintConfig.cpp:999
 msgid "The filament material type for use in custom G-codes."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:841
+#: src/libslic3r/PrintConfig.cpp:1026
 msgid "Soluble material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:842
+#: src/libslic3r/PrintConfig.cpp:1027
 msgid "Soluble material is most likely used for a soluble support."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:848
+#: src/libslic3r/PrintConfig.cpp:1033
 msgid ""
 "Enter your filament cost per kg here. This is only for statistical "
 "information."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:849
+#: src/libslic3r/PrintConfig.cpp:1034
 msgid "money/kg"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:854
+#: src/libslic3r/PrintConfig.cpp:1039
 msgid "Spool weight"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:855
+#: src/libslic3r/PrintConfig.cpp:1040
 msgid ""
 "Enter weight of the empty filament spool. One may weigh a partially consumed "
 "filament spool before printing and one may compare the measured weight with "
@@ -9231,103 +10462,105 @@ msgid ""
 "amount of filament on the spool is sufficient to finish the print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:859
+#: src/libslic3r/PrintConfig.cpp:1044
 msgid "g"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:868 src/libslic3r/PrintConfig.cpp:2904
+#: src/libslic3r/PrintConfig.cpp:1053 src/libslic3r/PrintConfig.cpp:3284
 msgid "(Unknown)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:872
+#: src/libslic3r/PrintConfig.cpp:1057
 msgid "Fill angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:874
+#: src/libslic3r/PrintConfig.cpp:1059
 msgid ""
 "Default base angle for infill orientation. Cross-hatching will be applied to "
 "this. Bridges will be infilled using the best direction Slic3r can detect, "
 "so this setting does not affect them."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:886
+#: src/libslic3r/PrintConfig.cpp:1071
 msgid "Fill density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:888
+#: src/libslic3r/PrintConfig.cpp:1073
 msgid "Density of internal infill, expressed in the range 0% - 100%."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:923
+#: src/libslic3r/PrintConfig.cpp:1108
 msgid "Fill pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:925
+#: src/libslic3r/PrintConfig.cpp:1110
 msgid "Fill pattern for general low-density infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:945
+#: src/libslic3r/PrintConfig.cpp:1130 src/libslic3r/PrintConfig.cpp:2700
 msgid "Grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:946
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:947
+#: src/libslic3r/PrintConfig.cpp:1132
 msgid "Stars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:948
+#: src/libslic3r/PrintConfig.cpp:1133
 msgid "Cubic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:949
+#: src/libslic3r/PrintConfig.cpp:1134
 msgid "Line"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:951 src/libslic3r/PrintConfig.cpp:2327
+#: src/libslic3r/PrintConfig.cpp:1136 src/libslic3r/PrintConfig.cpp:2653
 msgid "Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:952
+#: src/libslic3r/PrintConfig.cpp:1137
 msgid "3D Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:953
+#: src/libslic3r/PrintConfig.cpp:1138
 msgid "Gyroid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:957
+#: src/libslic3r/PrintConfig.cpp:1142
 msgid "Adaptive Cubic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:958
+#: src/libslic3r/PrintConfig.cpp:1143
 msgid "Support Cubic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:962 src/libslic3r/PrintConfig.cpp:971
-#: src/libslic3r/PrintConfig.cpp:981 src/libslic3r/PrintConfig.cpp:1015
-msgid "First layer"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:963
+#: src/libslic3r/PrintConfig.cpp:1148
 msgid ""
 "This is the acceleration your printer will use for first layer. Set zero to "
 "disable acceleration control for first layer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:972
+#: src/libslic3r/PrintConfig.cpp:1156
+msgid "First object layer over raft interface"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1157
+msgid ""
+"This is the acceleration your printer will use for first layer of object "
+"above raft interface. Set zero to disable acceleration control for first "
+"layer of object above raft interface."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1166
 msgid "First layer bed temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:973
+#: src/libslic3r/PrintConfig.cpp:1167
 msgid ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:983
+#: src/libslic3r/PrintConfig.cpp:1177
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for first "
 "layer. You can use this to force fatter extrudates for better adhesion. If "
@@ -9335,41 +10568,52 @@ msgid ""
 "layer height. If set to zero, it will use the default extrusion width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:996
+#: src/libslic3r/PrintConfig.cpp:1190
 msgid ""
 "When printing with very low layer heights, you might still want to print a "
 "thicker bottom layer to improve adhesion and tolerance for non perfect build "
-"plates. This can be expressed as an absolute value or as a percentage (for "
-"example: 150%) over the default layer height."
+"plates."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1005
+#: src/libslic3r/PrintConfig.cpp:1197
 msgid "First layer speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1006
+#: src/libslic3r/PrintConfig.cpp:1198
 msgid ""
 "If expressed as absolute value in mm/s, this speed will be applied to all "
 "the print moves of the first layer, regardless of their type. If expressed "
 "as a percentage (for example: 40%) it will scale the default speeds."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1016
+#: src/libslic3r/PrintConfig.cpp:1207
+msgid "Speed of object first layer over raft interface"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1208
+msgid ""
+"If expressed as absolute value in mm/s, this speed will be applied to all "
+"the print moves of the first object layer above raft interface, regardless "
+"of their type. If expressed as a percentage (for example: 40%) it will scale "
+"the default speeds."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1218
 msgid "First layer nozzle temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1017
+#: src/libslic3r/PrintConfig.cpp:1219
 msgid ""
 "Nozzle temperature for the first layer. If you want to control temperature "
 "manually during print, set this to zero to disable temperature control "
 "commands in the output G-code."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1025
+#: src/libslic3r/PrintConfig.cpp:1227
 msgid "Full fan speed at layer"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1026
+#: src/libslic3r/PrintConfig.cpp:1228
 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
 "\"disable_fan_first_layers\" to maximum at layer \"full_fan_speed_layer\". "
@@ -9378,62 +10622,55 @@ msgid ""
 "maximum allowed speed at layer \"disable_fan_first_layers\" + 1."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1036
-msgid "Fuzzy skin perimeter mode"
+#: src/libslic3r/PrintConfig.cpp:1240
+msgid "Fuzzy skin type."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1037 src/libslic3r/PrintConfig.cpp:1083
-#: src/libslic3r/PrintConfig.cpp:1092
-msgid "Fuzzy Skin"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1038
-msgid "Fuzzy skin perimeter mode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1046
-msgid "External"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1047
-msgid "External (skip first layer)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1048
+#: src/libslic3r/PrintConfig.cpp:1248
 msgid "All perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1082
+#: src/libslic3r/PrintConfig.cpp:1253
 msgid "Fuzzy skin thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1091
+#: src/libslic3r/PrintConfig.cpp:1262
 msgid "Fuzzy skin point distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1102
+#: src/libslic3r/PrintConfig.cpp:1271
+msgid "Fill gaps"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1273
+msgid ""
+"Enables filling of gaps between perimeters and between the inner most "
+"perimeters and infill."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1280
 msgid ""
 "Speed for filling small gaps using short zigzag moves. Keep this reasonably "
 "low to avoid too much shaking and resonance issues. Set zero to disable gaps "
 "filling."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1110
+#: src/libslic3r/PrintConfig.cpp:1288
 msgid "Verbose G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1111
+#: src/libslic3r/PrintConfig.cpp:1289
 msgid ""
 "Enable this to get a commented G-code file, with each line explained by a "
 "descriptive text. If you print from SD card, the additional weight of the "
 "file could make your firmware slow down."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1118
+#: src/libslic3r/PrintConfig.cpp:1296
 msgid "G-code flavor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1119
+#: src/libslic3r/PrintConfig.cpp:1297
 msgid ""
 "Some G/M-code commands, including temperature control and others, are not "
 "universal. Set this option to your printer's firmware to get a compatible "
@@ -9441,15 +10678,15 @@ msgid ""
 "extrusion value at all."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1324
 msgid "No extrusion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1149
+#: src/libslic3r/PrintConfig.cpp:1329
 msgid "Label objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1150
+#: src/libslic3r/PrintConfig.cpp:1330
 msgid ""
 "Enable this to add comments into the G-Code labeling print moves with what "
 "object they belong to, which is useful for the Octoprint CancelObject "
@@ -9457,42 +10694,42 @@ msgid ""
 "setup and Wipe into Object / Wipe into Infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1157
+#: src/libslic3r/PrintConfig.cpp:1337
 msgid "High extruder current on filament swap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1158
+#: src/libslic3r/PrintConfig.cpp:1338
 msgid ""
 "It may be beneficial to increase the extruder motor current during the "
 "filament exchange sequence to allow for rapid ramming feed rates and to "
 "overcome resistance when loading a filament with an ugly shaped tip."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1166
+#: src/libslic3r/PrintConfig.cpp:1346
 msgid ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1174
+#: src/libslic3r/PrintConfig.cpp:1354
 msgid "Combine infill every"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1176
+#: src/libslic3r/PrintConfig.cpp:1356
 msgid ""
 "This feature allows to combine infill and speed up your print by extruding "
 "thicker infill layers while preserving thin perimeters, thus accuracy."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1179
+#: src/libslic3r/PrintConfig.cpp:1359
 msgid "Combine infill every n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1185
+#: src/libslic3r/PrintConfig.cpp:1365
 msgid "Length of the infill anchor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1187
+#: src/libslic3r/PrintConfig.cpp:1367
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
 "additional perimeter. If expressed as percentage (example: 15%) it is "
@@ -9505,19 +10742,19 @@ msgid ""
 "perimeters connected to a single infill line."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1202
+#: src/libslic3r/PrintConfig.cpp:1382
 msgid "0 (no open anchors)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1229
+#: src/libslic3r/PrintConfig.cpp:1387 src/libslic3r/PrintConfig.cpp:1409
 msgid "1000 (unlimited)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1212
+#: src/libslic3r/PrintConfig.cpp:1392
 msgid "Maximum length of the infill anchor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1214
+#: src/libslic3r/PrintConfig.cpp:1394
 msgid ""
 "Connect an infill line to an internal perimeter with a short segment of an "
 "additional perimeter. If expressed as percentage (example: 15%) it is "
@@ -9529,19 +10766,19 @@ msgid ""
 "parameter. Set this parameter to zero to disable anchoring."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1224
+#: src/libslic3r/PrintConfig.cpp:1404
 msgid "0 (not anchored)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1234
+#: src/libslic3r/PrintConfig.cpp:1414
 msgid "Infill extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1236
+#: src/libslic3r/PrintConfig.cpp:1416
 msgid "The extruder to use when printing infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1244
+#: src/libslic3r/PrintConfig.cpp:1424
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for infill. If "
 "left zero, default extrusion width will be used if set, otherwise 1.125 x "
@@ -9550,32 +10787,32 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1254
+#: src/libslic3r/PrintConfig.cpp:1434
 msgid "Infill before perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1255
+#: src/libslic3r/PrintConfig.cpp:1435
 msgid ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1260
+#: src/libslic3r/PrintConfig.cpp:1440
 msgid "Only infill where needed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1262
+#: src/libslic3r/PrintConfig.cpp:1442
 msgid ""
 "This option will limit infill to the areas actually needed for supporting "
 "ceilings (it will act as internal support material). If enabled, slows down "
 "the G-code generation due to the multiple checks involved."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1269
+#: src/libslic3r/PrintConfig.cpp:1449
 msgid "Infill/perimeters overlap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1271
+#: src/libslic3r/PrintConfig.cpp:1451
 msgid ""
 "This setting applies an additional overlap between infill and perimeters for "
 "better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -9583,71 +10820,84 @@ msgid ""
 "perimeter extrusion width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1462
 msgid "Speed for printing the internal fill. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1290
+#: src/libslic3r/PrintConfig.cpp:1470
 msgid "Inherits profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1291
+#: src/libslic3r/PrintConfig.cpp:1471
 msgid "Name of the profile, from which this profile inherits."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1304
+#: src/libslic3r/PrintConfig.cpp:1484
 msgid "Interface shells"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1305
+#: src/libslic3r/PrintConfig.cpp:1485
 msgid ""
 "Force the generation of solid shells between adjacent materials/volumes. "
 "Useful for multi-extruder prints with translucent materials or manual "
 "soluble support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1313
+#: src/libslic3r/PrintConfig.cpp:1493
+msgid "Maximum width of a segmented region"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1494
+msgid "Maximum width of a segmented region. Zero disables this feature."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1495 src/libslic3r/PrintConfig.cpp:2091
+#: src/libslic3r/PrintConfig.cpp:2100
+msgid "mm (zero to disable)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1502
 msgid "Enable ironing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1314
+#: src/libslic3r/PrintConfig.cpp:1503
 msgid ""
 "Enable ironing of the top layers with the hot print head for smooth surface"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1320 src/libslic3r/PrintConfig.cpp:1322
+#: src/libslic3r/PrintConfig.cpp:1509 src/libslic3r/PrintConfig.cpp:1511
 msgid "Ironing Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1327
+#: src/libslic3r/PrintConfig.cpp:1516
 msgid "All top surfaces"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1328
+#: src/libslic3r/PrintConfig.cpp:1517
 msgid "Topmost surface only"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1329
+#: src/libslic3r/PrintConfig.cpp:1518
 msgid "All solid surfaces"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1334
+#: src/libslic3r/PrintConfig.cpp:1523
 msgid "Flow rate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1336
+#: src/libslic3r/PrintConfig.cpp:1525
 msgid "Percent of a flow rate relative to object's normal layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1344
+#: src/libslic3r/PrintConfig.cpp:1533
 msgid "Spacing between ironing passes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1346
+#: src/libslic3r/PrintConfig.cpp:1535
 msgid "Distance between ironing lines"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1552
 msgid ""
 "This custom code is inserted at every layer change, right after the Z move "
 "and before the extruder moves to the first layer point. Note that you can "
@@ -9655,11 +10905,11 @@ msgid ""
 "[layer_z]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1374
+#: src/libslic3r/PrintConfig.cpp:1563
 msgid "Supports remaining times"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1375
+#: src/libslic3r/PrintConfig.cpp:1564
 msgid ""
 "Emit M73 P[percent printed] R[remaining time in minutes] at 1 minute "
 "intervals into the G-code to let the firmware show accurate remaining time. "
@@ -9667,175 +10917,187 @@ msgid ""
 "firmware supports M73 Qxx Sxx for the silent mode."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:1572
 msgid "Supports stealth mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1384
+#: src/libslic3r/PrintConfig.cpp:1573
 msgid "The firmware supports stealth mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1389
+#: src/libslic3r/PrintConfig.cpp:1578
 msgid "How to apply limits"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1390
+#: src/libslic3r/PrintConfig.cpp:1579
 msgid "Purpose of Machine Limits"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1392
+#: src/libslic3r/PrintConfig.cpp:1581
 msgid "How to apply the Machine Limits"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1397
+#: src/libslic3r/PrintConfig.cpp:1586
 msgid "Emit to G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1398
+#: src/libslic3r/PrintConfig.cpp:1587
 msgid "Use for time estimate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1399
+#: src/libslic3r/PrintConfig.cpp:1588
 msgid "Ignore"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1422
+#: src/libslic3r/PrintConfig.cpp:1611
 msgid "Maximum feedrate X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1423
+#: src/libslic3r/PrintConfig.cpp:1612
 msgid "Maximum feedrate Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1424
+#: src/libslic3r/PrintConfig.cpp:1613
 msgid "Maximum feedrate Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1614
 msgid "Maximum feedrate E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1428
+#: src/libslic3r/PrintConfig.cpp:1617
 msgid "Maximum feedrate of the X axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1429
+#: src/libslic3r/PrintConfig.cpp:1618
 msgid "Maximum feedrate of the Y axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1430
+#: src/libslic3r/PrintConfig.cpp:1619
 msgid "Maximum feedrate of the Z axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1431
+#: src/libslic3r/PrintConfig.cpp:1620
 msgid "Maximum feedrate of the E axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1439
+#: src/libslic3r/PrintConfig.cpp:1628
 msgid "Maximum acceleration X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1440
+#: src/libslic3r/PrintConfig.cpp:1629
 msgid "Maximum acceleration Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1441
+#: src/libslic3r/PrintConfig.cpp:1630
 msgid "Maximum acceleration Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1442
+#: src/libslic3r/PrintConfig.cpp:1631
 msgid "Maximum acceleration E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1445
+#: src/libslic3r/PrintConfig.cpp:1634
 msgid "Maximum acceleration of the X axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1446
+#: src/libslic3r/PrintConfig.cpp:1635
 msgid "Maximum acceleration of the Y axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1447
+#: src/libslic3r/PrintConfig.cpp:1636
 msgid "Maximum acceleration of the Z axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1448
+#: src/libslic3r/PrintConfig.cpp:1637
 msgid "Maximum acceleration of the E axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1456
+#: src/libslic3r/PrintConfig.cpp:1645
 msgid "Maximum jerk X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1646
 msgid "Maximum jerk Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1458
+#: src/libslic3r/PrintConfig.cpp:1647
 msgid "Maximum jerk Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1459
+#: src/libslic3r/PrintConfig.cpp:1648
 msgid "Maximum jerk E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1462
+#: src/libslic3r/PrintConfig.cpp:1651
 msgid "Maximum jerk of the X axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1463
+#: src/libslic3r/PrintConfig.cpp:1652
 msgid "Maximum jerk of the Y axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1464
+#: src/libslic3r/PrintConfig.cpp:1653
 msgid "Maximum jerk of the Z axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1465
+#: src/libslic3r/PrintConfig.cpp:1654
 msgid "Maximum jerk of the E axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1475
+#: src/libslic3r/PrintConfig.cpp:1664
 msgid "Minimum feedrate when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1477
+#: src/libslic3r/PrintConfig.cpp:1666
 msgid "Minimum feedrate when extruding (M205 S)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1485
+#: src/libslic3r/PrintConfig.cpp:1674
 msgid "Minimum travel feedrate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1487
+#: src/libslic3r/PrintConfig.cpp:1676
 msgid "Minimum travel feedrate (M205 T)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1495
+#: src/libslic3r/PrintConfig.cpp:1684
 msgid "Maximum acceleration when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1497
-msgid "Maximum acceleration when extruding (M204 S)"
+#: src/libslic3r/PrintConfig.cpp:1686
+msgid ""
+"Maximum acceleration when extruding (M204 P)\n"
+"\n"
+"Marlin (legacy) firmware flavor will use this also as travel acceleration "
+"(M204 T)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1505
+#: src/libslic3r/PrintConfig.cpp:1697
 msgid "Maximum acceleration when retracting"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid "Maximum acceleration when retracting (M204 T)"
+#: src/libslic3r/PrintConfig.cpp:1699
+msgid "Maximum acceleration when retracting (M204 R)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1514 src/libslic3r/PrintConfig.cpp:1523
+#: src/libslic3r/PrintConfig.cpp:1707
+msgid "Maximum acceleration for travel moves"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1709
+msgid "Maximum acceleration for travel moves (M204 T)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1716 src/libslic3r/PrintConfig.cpp:1725
 msgid "Max"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1515
+#: src/libslic3r/PrintConfig.cpp:1717
 msgid "This setting represents the maximum speed of your fan."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1726
 #, possible-c-format
 msgid ""
 "This is the highest printable layer height for this extruder, used to cap "
@@ -9844,28 +11106,28 @@ msgid ""
 "adhesion. If set to 0, layer height is limited to 75% of the nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1534
+#: src/libslic3r/PrintConfig.cpp:1736
 msgid "Max print speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1535
+#: src/libslic3r/PrintConfig.cpp:1737
 msgid ""
 "When setting other speed settings to 0 Slic3r will autocalculate the optimal "
 "speed in order to keep constant extruder pressure. This experimental setting "
 "is used to set the highest print speed you want to allow."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1545
+#: src/libslic3r/PrintConfig.cpp:1747
 msgid ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1554
+#: src/libslic3r/PrintConfig.cpp:1756
 msgid "Max volumetric slope positive"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1555 src/libslic3r/PrintConfig.cpp:1566
+#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1768
 msgid ""
 "This experimental setting is used to limit the speed of change in extrusion "
 "rate. A value of 1.8 mm³/s² ensures, that a change from the extrusion rate "
@@ -9873,95 +11135,95 @@ msgid ""
 "s) to 5.4 mm³/s (feedrate 60 mm/s) will take at least 2 seconds."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1570
+#: src/libslic3r/PrintConfig.cpp:1761 src/libslic3r/PrintConfig.cpp:1772
 msgid "mm³/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1565
+#: src/libslic3r/PrintConfig.cpp:1767
 msgid "Max volumetric slope negative"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1577 src/libslic3r/PrintConfig.cpp:1586
+#: src/libslic3r/PrintConfig.cpp:1779 src/libslic3r/PrintConfig.cpp:1788
 msgid "Min"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1578
+#: src/libslic3r/PrintConfig.cpp:1780
 msgid "This setting represents the minimum PWM your fan needs to work."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1587
+#: src/libslic3r/PrintConfig.cpp:1789
 msgid ""
 "This is the lowest printable layer height for this extruder and limits the "
 "resolution for variable layer height. Typical values are between 0.05 mm and "
 "0.1 mm."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1595
+#: src/libslic3r/PrintConfig.cpp:1797
 msgid "Min print speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1596
+#: src/libslic3r/PrintConfig.cpp:1798
 msgid "Slic3r will not scale speed down below this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1603
+#: src/libslic3r/PrintConfig.cpp:1805
 msgid "Minimal filament extrusion length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1604
+#: src/libslic3r/PrintConfig.cpp:1806
 msgid ""
 "Generate no less than the number of skirt loops required to consume the "
 "specified amount of filament on the bottom layer. For multi-extruder "
 "machines, this minimum applies to each extruder."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1613
+#: src/libslic3r/PrintConfig.cpp:1815
 msgid "Configuration notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1614
+#: src/libslic3r/PrintConfig.cpp:1816
 msgid ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1624
+#: src/libslic3r/PrintConfig.cpp:1826
 msgid ""
 "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1629
+#: src/libslic3r/PrintConfig.cpp:1831
 msgid "Host Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1630
+#: src/libslic3r/PrintConfig.cpp:1832
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1647
+#: src/libslic3r/PrintConfig.cpp:1852
 msgid "Only retract when crossing perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1648
+#: src/libslic3r/PrintConfig.cpp:1853
 msgid ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1655
+#: src/libslic3r/PrintConfig.cpp:1860
 msgid ""
 "This option will drop the temperature of the inactive extruders to prevent "
 "oozing. It will enable a tall skirt automatically and move extruders outside "
 "such skirt when changing temperatures."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1662
+#: src/libslic3r/PrintConfig.cpp:1867
 msgid "Output filename format"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1663
+#: src/libslic3r/PrintConfig.cpp:1868
 msgid ""
 "You can use all configuration options as variables inside this template. For "
 "example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -9969,31 +11231,31 @@ msgid ""
 "[input_filename], [input_filename_base]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1672
+#: src/libslic3r/PrintConfig.cpp:1877
 msgid "Detect bridging perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1674
+#: src/libslic3r/PrintConfig.cpp:1879
 msgid ""
 "Experimental option to adjust flow for overhangs (bridge flow will be used), "
 "to apply bridge speed to them and enable fan."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1680
+#: src/libslic3r/PrintConfig.cpp:1885
 msgid "Filament parking position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1681
+#: src/libslic3r/PrintConfig.cpp:1886
 msgid ""
 "Distance of the extruder tip from the position where the filament is parked "
 "when unloaded. This should match the value in printer firmware."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1689
+#: src/libslic3r/PrintConfig.cpp:1894
 msgid "Extra loading distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1690
+#: src/libslic3r/PrintConfig.cpp:1895
 msgid ""
 "When set to zero, the distance the filament is moved from parking position "
 "during load is exactly the same as it was moved back during unload. When "
@@ -10001,27 +11263,27 @@ msgid ""
 "than unloading."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1698 src/libslic3r/PrintConfig.cpp:1715
-#: src/libslic3r/PrintConfig.cpp:1728 src/libslic3r/PrintConfig.cpp:1738
+#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:1920
+#: src/libslic3r/PrintConfig.cpp:1933 src/libslic3r/PrintConfig.cpp:1943
 msgid "Perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1699
+#: src/libslic3r/PrintConfig.cpp:1904
 msgid ""
 "This is the acceleration your printer will use for perimeters. Set zero to "
 "disable acceleration control for perimeters."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1706
+#: src/libslic3r/PrintConfig.cpp:1911
 msgid "Perimeter extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:1913
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1717
+#: src/libslic3r/PrintConfig.cpp:1922
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for perimeters. "
 "You may want to use thinner extrudates to get more accurate surfaces. If "
@@ -10030,12 +11292,12 @@ msgid ""
 "it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1730
+#: src/libslic3r/PrintConfig.cpp:1935
 msgid ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1740
+#: src/libslic3r/PrintConfig.cpp:1945
 msgid ""
 "This option sets the number of perimeters to generate for each layer. Note "
 "that Slic3r may increase this number automatically when it detects sloping "
@@ -10043,11 +11305,11 @@ msgid ""
 "Perimeters option is enabled."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1949
 msgid "(minimum)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1752
+#: src/libslic3r/PrintConfig.cpp:1957
 msgid ""
 "If you want to process the output G-code through custom scripts, just list "
 "their absolute paths here. Separate multiple scripts with a semicolon. "
@@ -10056,55 +11318,90 @@ msgid ""
 "environment variables."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1764
+#: src/libslic3r/PrintConfig.cpp:1969
 msgid "Printer type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1765
+#: src/libslic3r/PrintConfig.cpp:1970
 msgid "Type of the printer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1770
+#: src/libslic3r/PrintConfig.cpp:1975
 msgid "Printer notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1771
+#: src/libslic3r/PrintConfig.cpp:1976
 msgid "You can put your notes regarding the printer here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1779
+#: src/libslic3r/PrintConfig.cpp:1984
 msgid "Printer vendor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1780
+#: src/libslic3r/PrintConfig.cpp:1985
 msgid "Name of the printer vendor."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1785
+#: src/libslic3r/PrintConfig.cpp:1990
 msgid "Printer variant"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1786
+#: src/libslic3r/PrintConfig.cpp:1991
 msgid ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1803
+#: src/libslic3r/PrintConfig.cpp:2008
+msgid "Raft contact Z distance"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2010
+msgid ""
+"The vertical distance between object and raft. Ignored for soluble interface."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2017
+msgid "Raft expansion"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2019
+msgid "Expansion of the raft in XY plane for better stability."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2026
+msgid "First layer density"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2028
+msgid "Density of the first raft or support layer."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2036
+msgid "First layer expansion"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2038
+msgid ""
+"Expansion of the first raft or support layer to improve adhesion to print "
+"bed."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2045
 msgid "Raft layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1805
+#: src/libslic3r/PrintConfig.cpp:2047
 msgid ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1813
+#: src/libslic3r/PrintConfig.cpp:2055
 msgid "Resolution"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1814
+#: src/libslic3r/PrintConfig.cpp:2056
 msgid ""
 "Minimum detail resolution, used to simplify the input file for speeding up "
 "the slicing job and reducing memory usage. High-resolution models often "
@@ -10112,277 +11409,285 @@ msgid ""
 "simplification and use full resolution from input."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1824
+#: src/libslic3r/PrintConfig.cpp:2066
 msgid "Minimum travel after retraction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1825
+#: src/libslic3r/PrintConfig.cpp:2067
 msgid ""
 "Retraction is not triggered when travel moves are shorter than this length."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1831
+#: src/libslic3r/PrintConfig.cpp:2073
 msgid "Retract amount before wipe"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1832
+#: src/libslic3r/PrintConfig.cpp:2074
 msgid ""
 "With bowden extruders, it may be wise to do some amount of quick retract "
 "before doing the wipe movement."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1839
+#: src/libslic3r/PrintConfig.cpp:2081
 msgid "Retract on layer change"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1840
+#: src/libslic3r/PrintConfig.cpp:2082
 msgid "This flag enforces a retraction whenever a Z move is done."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1845 src/libslic3r/PrintConfig.cpp:1853
+#: src/libslic3r/PrintConfig.cpp:2087 src/libslic3r/PrintConfig.cpp:2095
 msgid "Length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1846
+#: src/libslic3r/PrintConfig.cpp:2088
 msgid "Retraction Length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1847
+#: src/libslic3r/PrintConfig.cpp:2089
 msgid ""
 "When retraction is triggered, filament is pulled back by the specified "
 "amount (the length is measured on raw filament, before it enters the "
 "extruder)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1849 src/libslic3r/PrintConfig.cpp:1858
-msgid "mm (zero to disable)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1854
+#: src/libslic3r/PrintConfig.cpp:2096
 msgid "Retraction Length (Toolchange)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1855
+#: src/libslic3r/PrintConfig.cpp:2097
 msgid ""
 "When retraction is triggered before changing tool, filament is pulled back "
 "by the specified amount (the length is measured on raw filament, before it "
 "enters the extruder)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1863
+#: src/libslic3r/PrintConfig.cpp:2105
 msgid "Lift Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1864
+#: src/libslic3r/PrintConfig.cpp:2106
 msgid ""
 "If you set this to a positive value, Z is quickly raised every time a "
 "retraction is triggered. When using multiple extruders, only the setting for "
 "the first extruder will be considered."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:2113
 msgid "Above Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1872
+#: src/libslic3r/PrintConfig.cpp:2114
 msgid "Only lift Z above"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:2115
 msgid ""
 "If you set this to a positive value, Z lift will only take place above the "
 "specified absolute Z. You can tune this setting for skipping lift on the "
 "first layers."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:2122
 msgid "Below Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1881
+#: src/libslic3r/PrintConfig.cpp:2123
 msgid "Only lift Z below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:2124
 msgid ""
 "If you set this to a positive value, Z lift will only take place below the "
 "specified absolute Z. You can tune this setting for limiting lift to the "
 "first layers."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1890 src/libslic3r/PrintConfig.cpp:1898
+#: src/libslic3r/PrintConfig.cpp:2132 src/libslic3r/PrintConfig.cpp:2140
 msgid "Extra length on restart"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1891
+#: src/libslic3r/PrintConfig.cpp:2133
 msgid ""
 "When the retraction is compensated after the travel move, the extruder will "
 "push this additional amount of filament. This setting is rarely needed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1899
+#: src/libslic3r/PrintConfig.cpp:2141
 msgid ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1906 src/libslic3r/PrintConfig.cpp:1907
+#: src/libslic3r/PrintConfig.cpp:2148 src/libslic3r/PrintConfig.cpp:2149
 msgid "Retraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1908
+#: src/libslic3r/PrintConfig.cpp:2150
 msgid "The speed for retractions (it only applies to the extruder motor)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1914 src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:2156 src/libslic3r/PrintConfig.cpp:2157
 msgid "Deretraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1916
+#: src/libslic3r/PrintConfig.cpp:2158
 msgid ""
 "The speed for loading of a filament into extruder after retraction (it only "
 "applies to the extruder motor). If left to zero, the retraction speed is "
 "used."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1923
+#: src/libslic3r/PrintConfig.cpp:2165
 msgid "Seam position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1925
+#: src/libslic3r/PrintConfig.cpp:2167
 msgid "Position of perimeters starting points."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:2173
 msgid "Random"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1932
+#: src/libslic3r/PrintConfig.cpp:2174
 msgid "Nearest"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1933
+#: src/libslic3r/PrintConfig.cpp:2175
 msgid "Aligned"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1941
+#: src/libslic3r/PrintConfig.cpp:2183
 msgid "Direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1943
+#: src/libslic3r/PrintConfig.cpp:2185
 msgid "Preferred direction of the seam"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1944
+#: src/libslic3r/PrintConfig.cpp:2186
 msgid "Seam preferred direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1951
+#: src/libslic3r/PrintConfig.cpp:2193
 msgid "Jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1953
+#: src/libslic3r/PrintConfig.cpp:2195
 msgid "Seam preferred direction jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1954
+#: src/libslic3r/PrintConfig.cpp:2196
 msgid "Preferred direction of the seam - jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1961
-msgid "Distance from object"
+#: src/libslic3r/PrintConfig.cpp:2203
+msgid "Distance from brim/object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1962
+#: src/libslic3r/PrintConfig.cpp:2204
 msgid ""
-"Distance between skirt and object(s). Set this to zero to attach the skirt "
-"to the object(s) and get a brim for better adhesion."
+"Distance between skirt and brim (when draft shield is not used) or objects."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1969
+#: src/libslic3r/PrintConfig.cpp:2210
 msgid "Skirt height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1970
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
+#: src/libslic3r/PrintConfig.cpp:2211
+msgid "Height of skirt expressed in layers."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1977
+#: src/libslic3r/PrintConfig.cpp:2217
 msgid "Draft shield"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1978
+#: src/libslic3r/PrintConfig.cpp:2218
 msgid ""
-"If enabled, the skirt will be as tall as a highest printed object. This is "
-"useful to protect an ABS or ASA print from warping and detaching from print "
-"bed due to wind draft."
+"With draft shield active, the skirt will be printed skirt_distance from the "
+"object, possibly intersecting brim.\n"
+"Enabled = skirt is as tall as the highest printed object.\n"
+"Limited = skirt is as tall as specified by skirt_height.\n"
+"This is useful to protect an ABS or ASA print from warping and detaching "
+"from print bed due to wind draft."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:2226
+msgid "Disabled"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2227
+msgid "Limited"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2228
+msgid "Enabled"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2233
 msgid "Loops (minimum)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:2234
 msgid "Skirt Loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1986
+#: src/libslic3r/PrintConfig.cpp:2235
 msgid ""
 "Number of loops for the skirt. If the Minimum Extrusion Length option is "
 "set, the number of loops might be greater than the one configured here. Set "
 "this to zero to disable skirt completely."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1994
+#: src/libslic3r/PrintConfig.cpp:2243
 msgid "Slow down if layer print time is below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1995
+#: src/libslic3r/PrintConfig.cpp:2244
 msgid ""
 "If layer print time is estimated below this number of seconds, print moves "
 "speed will be scaled down to extend duration to this value."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:2253
 msgid "Small perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2006
+#: src/libslic3r/PrintConfig.cpp:2255
 msgid ""
 "This separate setting will affect the speed of perimeters having radius <= "
 "6.5mm (usually holes). If expressed as percentage (for example: 80%) it will "
 "be calculated on the perimeters speed setting above. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2016
+#: src/libslic3r/PrintConfig.cpp:2265
 msgid "Solid infill threshold area"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2018
+#: src/libslic3r/PrintConfig.cpp:2267
 msgid ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2019
+#: src/libslic3r/PrintConfig.cpp:2268
 msgid "mm²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2025
+#: src/libslic3r/PrintConfig.cpp:2274
 msgid "Solid infill extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2027
+#: src/libslic3r/PrintConfig.cpp:2276
 msgid "The extruder to use when printing solid infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2033
+#: src/libslic3r/PrintConfig.cpp:2282
 msgid "Solid infill every"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2035
+#: src/libslic3r/PrintConfig.cpp:2284
 msgid ""
 "This feature allows to force a solid layer every given number of layers. "
 "Zero to disable. You can set this to any value (for example 9999); Slic3r "
@@ -10390,7 +11695,7 @@ msgid ""
 "according to nozzle diameter and layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2047
+#: src/libslic3r/PrintConfig.cpp:2296
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for infill for "
 "solid surfaces. If left zero, default extrusion width will be used if set, "
@@ -10398,26 +11703,26 @@ msgid ""
 "(for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:2307
 msgid ""
 "Speed for printing solid regions (top/bottom/internal horizontal shells). "
 "This can be expressed as a percentage (for example: 80%) over the default "
 "infill speed above. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2070
+#: src/libslic3r/PrintConfig.cpp:2319
 msgid "Number of solid layers to generate on top and bottom surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2076 src/libslic3r/PrintConfig.cpp:2077
+#: src/libslic3r/PrintConfig.cpp:2325 src/libslic3r/PrintConfig.cpp:2326
 msgid "Minimum thickness of a top / bottom shell"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2083
+#: src/libslic3r/PrintConfig.cpp:2332
 msgid "Spiral vase"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2084
+#: src/libslic3r/PrintConfig.cpp:2333
 msgid ""
 "This feature will raise Z gradually while printing a single-walled object in "
 "order to remove any visible seam. This option requires a single perimeter, "
@@ -10426,18 +11731,18 @@ msgid ""
 "when printing more than one single object."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2092
+#: src/libslic3r/PrintConfig.cpp:2341
 msgid "Temperature variation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2093
+#: src/libslic3r/PrintConfig.cpp:2342
 msgid ""
 "Temperature difference to be applied when an extruder is not active. Enables "
 "a full-height \"sacrificial\" skirt on which the nozzles are periodically "
 "wiped."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2103
+#: src/libslic3r/PrintConfig.cpp:2352
 msgid ""
 "This start procedure is inserted at the beginning, after bed has reached the "
 "target temperature and extruder just started heating, and before extruder "
@@ -10448,7 +11753,7 @@ msgid ""
 "put a \"M109 S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2118
+#: src/libslic3r/PrintConfig.cpp:2367
 msgid ""
 "This start procedure is inserted at the beginning, after any printer start "
 "gcode (and after any toolchange to this filament in case of multi-material "
@@ -10461,45 +11766,45 @@ msgid ""
 "extruders, the gcode is processed in extruder order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2134
+#: src/libslic3r/PrintConfig.cpp:2383
 msgid "Color change G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2135
+#: src/libslic3r/PrintConfig.cpp:2384
 msgid "This G-code will be used as a code for the color change"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2144
+#: src/libslic3r/PrintConfig.cpp:2393
 msgid "This G-code will be used as a code for the pause print"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2402
 msgid "This G-code will be used as a custom code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2161
+#: src/libslic3r/PrintConfig.cpp:2410
 msgid "Single Extruder Multi Material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2162
+#: src/libslic3r/PrintConfig.cpp:2411
 msgid "The printer multiplexes filaments into a single hot end."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2167
+#: src/libslic3r/PrintConfig.cpp:2416
 msgid "Prime all printing extruders"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2417
 msgid ""
 "If enabled, all printing extruders will be primed at the front edge of the "
 "print bed at the start of the print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2173
+#: src/libslic3r/PrintConfig.cpp:2422
 msgid "No sparse layers (EXPERIMENTAL)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2174
+#: src/libslic3r/PrintConfig.cpp:2423
 msgid ""
 "If enabled, the wipe tower will not be printed on layers with no "
 "toolchanges. On layers with a toolchange, extruder will travel downward to "
@@ -10507,75 +11812,135 @@ msgid ""
 "with the print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2181
+#: src/libslic3r/PrintConfig.cpp:2430
+msgid "Slice gap closing radius"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2432
+msgid ""
+"Cracks smaller than 2x gap closing radius are being filled during the "
+"triangle mesh slicing. The gap closing operation may reduce the final print "
+"resolution, therefore it is advisable to keep the value reasonably low."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2440
+msgid "Slicing Mode"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2442
+msgid ""
+"Use \"Even / Odd\" for 3DLabPrint airplane models. Use \"Close holes\" to "
+"close all holes in the model."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2447
+msgid "Regular"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2448
+msgid "Even / Odd"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2449
+msgid "Close holes"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2454
 msgid "Generate support material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2183
+#: src/libslic3r/PrintConfig.cpp:2456
 msgid "Enable support material generation."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2187
+#: src/libslic3r/PrintConfig.cpp:2460
 msgid "Auto generated supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2189
+#: src/libslic3r/PrintConfig.cpp:2462
 msgid ""
 "If checked, supports will be generated automatically based on the overhang "
 "threshold value. If unchecked, supports will be generated inside the "
 "\"Support Enforcer\" volumes only."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2195
+#: src/libslic3r/PrintConfig.cpp:2468
 msgid "XY separation between an object and its support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2197
+#: src/libslic3r/PrintConfig.cpp:2470
 msgid ""
 "XY separation between an object and its support. If expressed as percentage "
 "(for example 50%), it will be calculated over external perimeter width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2207
+#: src/libslic3r/PrintConfig.cpp:2480
 msgid "Pattern angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2209
+#: src/libslic3r/PrintConfig.cpp:2482
 msgid ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2219 src/libslic3r/PrintConfig.cpp:3014
+#: src/libslic3r/PrintConfig.cpp:2492 src/libslic3r/PrintConfig.cpp:3394
 msgid ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2225
-msgid "Contact Z distance"
+#: src/libslic3r/PrintConfig.cpp:2498
+msgid "Top contact Z distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2227
+#: src/libslic3r/PrintConfig.cpp:2500
 msgid ""
 "The vertical distance between object and support material interface. Setting "
 "this to 0 will also prevent Slic3r from using bridge flow and speed for the "
 "first object layer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2234
+#: src/libslic3r/PrintConfig.cpp:2508
 msgid "0 (soluble)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2235
+#: src/libslic3r/PrintConfig.cpp:2509
+msgid "0.1 (detachable)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2510
 msgid "0.2 (detachable)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2516
+msgid "Bottom contact Z distance"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2518
+msgid ""
+"The vertical distance between the object top surface and the support "
+"material interface. If set to zero, support_material_contact_distance will "
+"be used for both top and bottom contact Z distances."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2525 src/libslic3r/PrintConfig.cpp:2608
+msgid "same as top"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2526
+msgid "0.1"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2527
+msgid "0.2"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2532
 msgid "Enforce support for the first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2242
+#: src/libslic3r/PrintConfig.cpp:2534
 msgid ""
 "Generate support material for the specified number of layers counting from "
 "bottom, regardless of whether normal support material is enabled or not and "
@@ -10583,21 +11948,21 @@ msgid ""
 "of objects having a very thin or poor footprint on the build plate."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2247
+#: src/libslic3r/PrintConfig.cpp:2539
 msgid "Enforce support for the first n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2253
+#: src/libslic3r/PrintConfig.cpp:2545
 msgid "Support material/raft/skirt extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2255
+#: src/libslic3r/PrintConfig.cpp:2547
 msgid ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2264
+#: src/libslic3r/PrintConfig.cpp:2556
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for support "
 "material. If left zero, default extrusion width will be used if set, "
@@ -10605,89 +11970,151 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2273
+#: src/libslic3r/PrintConfig.cpp:2565
 msgid "Interface loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2275
+#: src/libslic3r/PrintConfig.cpp:2567
 msgid ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2280
+#: src/libslic3r/PrintConfig.cpp:2572
 msgid "Support material/raft interface extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2282
+#: src/libslic3r/PrintConfig.cpp:2574
 msgid ""
 "The extruder to use when printing support material interface (1+, 0 to use "
 "the current extruder to minimize tool changes). This affects raft too."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Interface layers"
+#: src/libslic3r/PrintConfig.cpp:2582
+msgid "Top interface layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2291
+#: src/libslic3r/PrintConfig.cpp:2584
 msgid ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2298
+#: src/libslic3r/PrintConfig.cpp:2591
+msgid "0 (off)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2592
+msgid "1 (light)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2593
+msgid "2 (default)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2594
+msgid "3 (heavy)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2600
+msgid "Bottom interface layers"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2602
+msgid ""
+"Number of interface layers to insert between the object(s) and support "
+"material. Set to -1 to use support_material_interface_layers"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2614
+msgid "Closing radius"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2616
+msgid ""
+"For snug supports, the support regions will be merged using morphological "
+"closing operation. Gaps smaller than the closing radius will be filled in."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2624
 msgid "Interface pattern spacing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2300
+#: src/libslic3r/PrintConfig.cpp:2626
 msgid "Spacing between interface lines. Set zero to get a solid interface."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2309
+#: src/libslic3r/PrintConfig.cpp:2635
 msgid ""
 "Speed for printing support material interface layers. If expressed as "
 "percentage (for example 50%) it will be calculated over support material "
 "speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2318
+#: src/libslic3r/PrintConfig.cpp:2644
 msgid "Pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2320
+#: src/libslic3r/PrintConfig.cpp:2646
 msgid "Pattern used to generate support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2326
+#: src/libslic3r/PrintConfig.cpp:2652
 msgid "Rectilinear grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2332
+#: src/libslic3r/PrintConfig.cpp:2658
+msgid "Interface pattern"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2660
+msgid ""
+"Pattern used to generate support material interface. Default pattern for non-"
+"soluble support interface is Rectilinear, while default pattern for soluble "
+"support interface is Concentric."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2674
 msgid "Pattern spacing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2334
+#: src/libslic3r/PrintConfig.cpp:2676
 msgid "Spacing between support material lines."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2343
+#: src/libslic3r/PrintConfig.cpp:2685
 msgid "Speed for printing support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2350
+#: src/libslic3r/PrintConfig.cpp:2692
+msgid "Style"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2694
+msgid ""
+"Style and shape of the support towers. Projecting the supports into a "
+"regular grid will create more stable supports, while snug support towers "
+"will save material and reduce object scarring."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2701
+msgid "Snug"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2706
 msgid "Synchronize with object layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2352
+#: src/libslic3r/PrintConfig.cpp:2708
 msgid ""
 "Synchronize support layers with the object print layers. This is useful with "
 "multi-material printers, where the extruder switch is expensive."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2358
+#: src/libslic3r/PrintConfig.cpp:2714
 msgid "Overhang threshold"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2360
+#: src/libslic3r/PrintConfig.cpp:2716
 msgid ""
 "Support material will not be generated for overhangs whose slope angle (90° "
 "= vertical) is above the given threshold. In other words, this value "
@@ -10696,57 +12123,65 @@ msgid ""
 "detection (recommended)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2372
+#: src/libslic3r/PrintConfig.cpp:2728
 msgid "With sheath around the support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2730
 msgid ""
 "Add a sheath (a single perimeter line) around the base support. This makes "
 "the support more reliable, but also more difficult to remove."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2737
 msgid ""
 "Nozzle temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output G-code."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2384
+#: src/libslic3r/PrintConfig.cpp:2740
 msgid "Nozzle temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2390
+#: src/libslic3r/PrintConfig.cpp:2746
+msgid "Thick bridges"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2748
+msgid "Print bridges with round extrusions."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2753
 msgid "Detect thin walls"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2392
+#: src/libslic3r/PrintConfig.cpp:2755
 msgid ""
 "Detect single-width walls (parts where two extrusions don't fit and we need "
 "to collapse them into a single trace)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2398
+#: src/libslic3r/PrintConfig.cpp:2761
 msgid "Threads"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2399
+#: src/libslic3r/PrintConfig.cpp:2762
 msgid ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2411
+#: src/libslic3r/PrintConfig.cpp:2774
 msgid ""
 "This custom code is inserted before every toolchange. Placeholder variables "
-"for all PrusaSlicer settings as well as {previous_extruder} and "
-"{next_extruder} can be used. When a tool-changing command which changes to "
-"the correct extruder is included (such as T{next_extruder}), PrusaSlicer "
+"for all PrusaSlicer settings as well as {toolchange_z}, {previous_extruder} "
+"and {next_extruder} can be used. When a tool-changing command which changes "
+"to the correct extruder is included (such as T{next_extruder}), PrusaSlicer "
 "will emit no other such command. It is therefore possible to script custom "
 "behaviour both before and after the toolchange."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2424
+#: src/libslic3r/PrintConfig.cpp:2787
 msgid ""
 "Set this to a non-zero value to set a manual extrusion width for infill for "
 "top surfaces. You may want to use thinner extrudates to fill all narrow "
@@ -10755,7 +12190,7 @@ msgid ""
 "percentage (for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2436
+#: src/libslic3r/PrintConfig.cpp:2799
 msgid ""
 "Speed for printing top solid layers (it only applies to the uppermost "
 "external layers and not to their internal solid layers). You may want to "
@@ -10764,54 +12199,65 @@ msgid ""
 "for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2451
+#: src/libslic3r/PrintConfig.cpp:2814
 msgid "Number of solid layers to generate on top surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2452
+#: src/libslic3r/PrintConfig.cpp:2815
 msgid "Top solid layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2460
+#: src/libslic3r/PrintConfig.cpp:2823
 msgid ""
 "The number of top solid layers is increased above top_solid_layers if "
 "necessary to satisfy minimum thickness of top shell. This is useful to "
 "prevent pillowing effect when printing with variable layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2463
+#: src/libslic3r/PrintConfig.cpp:2826
 msgid "Minimum top shell thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2470
+#: src/libslic3r/PrintConfig.cpp:2833
 msgid "Speed for travel moves (jumps between distant extrusion points)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2478
+#: src/libslic3r/PrintConfig.cpp:2841
+msgid "Z travel"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2842
+msgid ""
+"Speed for movements along the Z axis.\n"
+"When set to zero, the value is ignored and regular travel speed is used "
+"instead."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2850
 msgid "Use firmware retraction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:2851
 msgid ""
 "This experimental setting uses G10 and G11 commands to have the firmware "
 "handle the retraction. This is only supported in recent Marlin."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2485
+#: src/libslic3r/PrintConfig.cpp:2857
 msgid "Use relative E distances"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2486
+#: src/libslic3r/PrintConfig.cpp:2858
 msgid ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2492
+#: src/libslic3r/PrintConfig.cpp:2864
 msgid "Use volumetric E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2493
+#: src/libslic3r/PrintConfig.cpp:2865
 msgid ""
 "This experimental setting uses outputs the E values in cubic millimeters "
 "instead of linear millimeters. If your firmware doesn't already know "
@@ -10821,127 +12267,131 @@ msgid ""
 "only supported in recent Marlin."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2875
 msgid "Enable variable layer height feature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2504
+#: src/libslic3r/PrintConfig.cpp:2876
 msgid ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2510
+#: src/libslic3r/PrintConfig.cpp:2882
 msgid "Wipe while retracting"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2511
+#: src/libslic3r/PrintConfig.cpp:2883
 msgid ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2518
+#: src/libslic3r/PrintConfig.cpp:2890
 msgid ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2524
+#: src/libslic3r/PrintConfig.cpp:2896
 msgid "Purging volumes - load/unload volumes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2525
+#: src/libslic3r/PrintConfig.cpp:2897
 msgid ""
 "This vector saves required volumes to change from/to each tool used on the "
 "wipe tower. These values are used to simplify creation of the full purging "
 "volumes below."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2531
+#: src/libslic3r/PrintConfig.cpp:2903
 msgid "Purging volumes - matrix"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2532
+#: src/libslic3r/PrintConfig.cpp:2904
 msgid ""
 "This matrix describes volumes (in cubic milimetres) required to purge the "
 "new filament on the wipe tower for any given pair of tools."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2541
+#: src/libslic3r/PrintConfig.cpp:2913
 msgid "Position X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2914
 msgid "X coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2920
 msgid "Position Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2549
+#: src/libslic3r/PrintConfig.cpp:2921
 msgid "Y coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2556
+#: src/libslic3r/PrintConfig.cpp:2928
 msgid "Width of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2562
+#: src/libslic3r/PrintConfig.cpp:2934
 msgid "Wipe tower rotation angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2563
+#: src/libslic3r/PrintConfig.cpp:2935
 msgid "Wipe tower rotation angle with respect to x-axis."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2570
+#: src/libslic3r/PrintConfig.cpp:2941 src/libslic3r/PrintConfig.cpp:2942
+msgid "Wipe tower brim width"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2950
 msgid "Wipe into this object's infill"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2571
+#: src/libslic3r/PrintConfig.cpp:2951
 msgid ""
-"Purging after toolchange will done inside this object's infills. This lowers "
-"the amount of waste but may result in longer print time  due to additional "
-"travel moves."
+"Purging after toolchange will be done inside this object's infills. This "
+"lowers the amount of waste but may result in longer print time  due to "
+"additional travel moves."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:2958
 msgid "Wipe into this object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2579
+#: src/libslic3r/PrintConfig.cpp:2959
 msgid ""
 "Object will be used to purge the nozzle after a toolchange to save material "
 "that would otherwise end up in the wipe tower and decrease print time. "
 "Colours of the objects will be mixed as a result."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2585
+#: src/libslic3r/PrintConfig.cpp:2965
 msgid "Maximal bridging distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2586
+#: src/libslic3r/PrintConfig.cpp:2966
 msgid "Maximal distance between supports on sparse infill sections."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2592
+#: src/libslic3r/PrintConfig.cpp:2972
 msgid "XY Size Compensation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2594
+#: src/libslic3r/PrintConfig.cpp:2974
 msgid ""
 "The object will be grown/shrunk in the XY plane by the configured value "
 "(negative = inwards, positive = outwards). This might be useful for fine-"
 "tuning hole sizes."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2602
+#: src/libslic3r/PrintConfig.cpp:2982
 msgid "Z offset"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2603
+#: src/libslic3r/PrintConfig.cpp:2983
 msgid ""
 "This value will be added (or subtracted) from all the Z coordinates in the "
 "output G-code. It is used to compensate for bad Z endstop position: for "
@@ -10949,414 +12399,414 @@ msgid ""
 "print bed, set this to -0.3 (or fix your endstop)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2670
+#: src/libslic3r/PrintConfig.cpp:3050
 msgid "Display width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2671
+#: src/libslic3r/PrintConfig.cpp:3051
 msgid "Width of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2676
+#: src/libslic3r/PrintConfig.cpp:3056
 msgid "Display height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2677
+#: src/libslic3r/PrintConfig.cpp:3057
 msgid "Height of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2682
+#: src/libslic3r/PrintConfig.cpp:3062
 msgid "Number of pixels in"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2684
+#: src/libslic3r/PrintConfig.cpp:3064
 msgid "Number of pixels in X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2690
+#: src/libslic3r/PrintConfig.cpp:3070
 msgid "Number of pixels in Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2695
+#: src/libslic3r/PrintConfig.cpp:3075
 msgid "Display horizontal mirroring"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2696
+#: src/libslic3r/PrintConfig.cpp:3076
 msgid "Mirror horizontally"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2697
+#: src/libslic3r/PrintConfig.cpp:3077
 msgid "Enable horizontal mirroring of output images"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2702
+#: src/libslic3r/PrintConfig.cpp:3082
 msgid "Display vertical mirroring"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2703
+#: src/libslic3r/PrintConfig.cpp:3083
 msgid "Mirror vertically"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2704
+#: src/libslic3r/PrintConfig.cpp:3084
 msgid "Enable vertical mirroring of output images"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2709
+#: src/libslic3r/PrintConfig.cpp:3089
 msgid "Display orientation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2710
+#: src/libslic3r/PrintConfig.cpp:3090
 msgid ""
 "Set the actual LCD display orientation inside the SLA printer. Portrait mode "
 "will flip the meaning of display width and height parameters and the output "
 "images will be rotated by 90 degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2716
+#: src/libslic3r/PrintConfig.cpp:3096
 msgid "Landscape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2717
+#: src/libslic3r/PrintConfig.cpp:3097
 msgid "Portrait"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2722
+#: src/libslic3r/PrintConfig.cpp:3102
 msgid "Fast"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2723
+#: src/libslic3r/PrintConfig.cpp:3103
 msgid "Fast tilt"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2724
+#: src/libslic3r/PrintConfig.cpp:3104
 msgid "Time of the fast tilt"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2731
+#: src/libslic3r/PrintConfig.cpp:3111
 msgid "Slow"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2732
+#: src/libslic3r/PrintConfig.cpp:3112
 msgid "Slow tilt"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2733
+#: src/libslic3r/PrintConfig.cpp:3113
 msgid "Time of the slow tilt"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2740
+#: src/libslic3r/PrintConfig.cpp:3120
 msgid "Area fill"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2741
+#: src/libslic3r/PrintConfig.cpp:3121
 msgid ""
 "The percentage of the bed area. \n"
 "If the print area exceeds the specified value, \n"
 "then a slow tilt will be used, otherwise - a fast tilt"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2748 src/libslic3r/PrintConfig.cpp:2749
-#: src/libslic3r/PrintConfig.cpp:2750
+#: src/libslic3r/PrintConfig.cpp:3128 src/libslic3r/PrintConfig.cpp:3129
+#: src/libslic3r/PrintConfig.cpp:3130
 msgid "Printer scaling correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2756 src/libslic3r/PrintConfig.cpp:2757
+#: src/libslic3r/PrintConfig.cpp:3136 src/libslic3r/PrintConfig.cpp:3137
 msgid "Printer absolute correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2758
+#: src/libslic3r/PrintConfig.cpp:3138
 msgid ""
 "Will inflate or deflate the sliced 2D polygons according to the sign of the "
 "correction."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2764
+#: src/libslic3r/PrintConfig.cpp:3144
 msgid "Elephant foot minimum width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2766
+#: src/libslic3r/PrintConfig.cpp:3146
 msgid ""
 "Minimum width of features to maintain when doing elephant foot compensation."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2773 src/libslic3r/PrintConfig.cpp:2774
+#: src/libslic3r/PrintConfig.cpp:3153 src/libslic3r/PrintConfig.cpp:3154
 msgid "Printer gamma correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2775
+#: src/libslic3r/PrintConfig.cpp:3155
 msgid ""
 "This will apply a gamma correction to the rasterized 2D polygons. A gamma "
 "value of zero means thresholding with the threshold in the middle. This "
 "behaviour eliminates antialiasing without losing holes in polygons."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2787 src/libslic3r/PrintConfig.cpp:2788
+#: src/libslic3r/PrintConfig.cpp:3167 src/libslic3r/PrintConfig.cpp:3168
 msgid "SLA material type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2799 src/libslic3r/PrintConfig.cpp:2800
+#: src/libslic3r/PrintConfig.cpp:3179 src/libslic3r/PrintConfig.cpp:3180
 msgid "Initial layer height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2806 src/libslic3r/PrintConfig.cpp:2807
+#: src/libslic3r/PrintConfig.cpp:3186 src/libslic3r/PrintConfig.cpp:3187
 msgid "Bottle volume"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2808
+#: src/libslic3r/PrintConfig.cpp:3188
 msgid "ml"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2813 src/libslic3r/PrintConfig.cpp:2814
+#: src/libslic3r/PrintConfig.cpp:3193 src/libslic3r/PrintConfig.cpp:3194
 msgid "Bottle weight"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2815
+#: src/libslic3r/PrintConfig.cpp:3195
 msgid "kg"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2822
+#: src/libslic3r/PrintConfig.cpp:3202
 msgid "g/ml"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2829
+#: src/libslic3r/PrintConfig.cpp:3209
 msgid "money/bottle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2834
+#: src/libslic3r/PrintConfig.cpp:3214
 msgid "Faded layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2835
+#: src/libslic3r/PrintConfig.cpp:3215
 msgid ""
 "Number of the layers needed for the exposure time fade from initial exposure "
 "time to the exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2842 src/libslic3r/PrintConfig.cpp:2843
+#: src/libslic3r/PrintConfig.cpp:3222 src/libslic3r/PrintConfig.cpp:3223
 msgid "Minimum exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2850 src/libslic3r/PrintConfig.cpp:2851
+#: src/libslic3r/PrintConfig.cpp:3230 src/libslic3r/PrintConfig.cpp:3231
 msgid "Maximum exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2858 src/libslic3r/PrintConfig.cpp:2859
+#: src/libslic3r/PrintConfig.cpp:3238 src/libslic3r/PrintConfig.cpp:3239
 msgid "Exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2865 src/libslic3r/PrintConfig.cpp:2866
+#: src/libslic3r/PrintConfig.cpp:3245 src/libslic3r/PrintConfig.cpp:3246
 msgid "Minimum initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2873 src/libslic3r/PrintConfig.cpp:2874
+#: src/libslic3r/PrintConfig.cpp:3253 src/libslic3r/PrintConfig.cpp:3254
 msgid "Maximum initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2881 src/libslic3r/PrintConfig.cpp:2882
+#: src/libslic3r/PrintConfig.cpp:3261 src/libslic3r/PrintConfig.cpp:3262
 msgid "Initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2888 src/libslic3r/PrintConfig.cpp:2889
+#: src/libslic3r/PrintConfig.cpp:3268 src/libslic3r/PrintConfig.cpp:3269
 msgid "Correction for expansion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2895
+#: src/libslic3r/PrintConfig.cpp:3275
 msgid "SLA print material notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2896
+#: src/libslic3r/PrintConfig.cpp:3276
 msgid "You can put your notes regarding the SLA print material here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2908 src/libslic3r/PrintConfig.cpp:2919
+#: src/libslic3r/PrintConfig.cpp:3288 src/libslic3r/PrintConfig.cpp:3299
 msgid "Default SLA material profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2930
+#: src/libslic3r/PrintConfig.cpp:3310
 msgid "Generate supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2932
+#: src/libslic3r/PrintConfig.cpp:3312
 msgid "Generate supports for the models"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2937
+#: src/libslic3r/PrintConfig.cpp:3317
 msgid "Pinhead front diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2939
+#: src/libslic3r/PrintConfig.cpp:3319
 msgid "Diameter of the pointing side of the head"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2946
+#: src/libslic3r/PrintConfig.cpp:3326
 msgid "Head penetration"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2948
+#: src/libslic3r/PrintConfig.cpp:3328
 msgid "How much the pinhead has to penetrate the model surface"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2955
+#: src/libslic3r/PrintConfig.cpp:3335
 msgid "Pinhead width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2957
+#: src/libslic3r/PrintConfig.cpp:3337
 msgid "Width from the back sphere center to the front sphere center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2965
+#: src/libslic3r/PrintConfig.cpp:3345
 msgid "Pillar diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2967
+#: src/libslic3r/PrintConfig.cpp:3347
 msgid "Diameter in mm of the support pillars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2975
+#: src/libslic3r/PrintConfig.cpp:3355
 msgid "Small pillar diameter percent"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2977
+#: src/libslic3r/PrintConfig.cpp:3357
 msgid ""
 "The percentage of smaller pillars compared to the normal pillar diameter "
 "which are used in problematic areas where a normal pilla cannot fit."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2986
+#: src/libslic3r/PrintConfig.cpp:3366
 msgid "Max bridges on a pillar"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2988
+#: src/libslic3r/PrintConfig.cpp:3368
 msgid ""
 "Maximum number of bridges that can be placed on a pillar. Bridges hold "
 "support point pinheads and connect to pillars as small branches."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2996
+#: src/libslic3r/PrintConfig.cpp:3376
 msgid "Pillar connection mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2997
+#: src/libslic3r/PrintConfig.cpp:3377
 msgid ""
 "Controls the bridge type between two neighboring pillars. Can be zig-zag, "
 "cross (double zig-zag) or dynamic which will automatically switch between "
 "the first two depending on the distance of the two pillars."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3005
+#: src/libslic3r/PrintConfig.cpp:3385
 msgid "Zig-Zag"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3006
+#: src/libslic3r/PrintConfig.cpp:3386
 msgid "Cross"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3007
+#: src/libslic3r/PrintConfig.cpp:3387
 msgid "Dynamic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3019
+#: src/libslic3r/PrintConfig.cpp:3399
 msgid "Pillar widening factor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3021
+#: src/libslic3r/PrintConfig.cpp:3401
 msgid ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3030
+#: src/libslic3r/PrintConfig.cpp:3410
 msgid "Support base diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3032
+#: src/libslic3r/PrintConfig.cpp:3412
 msgid "Diameter in mm of the pillar base"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3040
+#: src/libslic3r/PrintConfig.cpp:3420
 msgid "Support base height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3042
+#: src/libslic3r/PrintConfig.cpp:3422
 msgid "The height of the pillar base cone"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3049
+#: src/libslic3r/PrintConfig.cpp:3429
 msgid "Support base safety distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3052
+#: src/libslic3r/PrintConfig.cpp:3432
 msgid ""
 "The minimum distance of the pillar base from the model in mm. Makes sense in "
 "zero elevation mode where a gap according to this parameter is inserted "
 "between the model and the pad."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3062
+#: src/libslic3r/PrintConfig.cpp:3442
 msgid "Critical angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3064
+#: src/libslic3r/PrintConfig.cpp:3444
 msgid "The default angle for connecting support sticks and junctions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3072
+#: src/libslic3r/PrintConfig.cpp:3452
 msgid "Max bridge length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3074
+#: src/libslic3r/PrintConfig.cpp:3454
 msgid "The max length of a bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3081
+#: src/libslic3r/PrintConfig.cpp:3461
 msgid "Max pillar linking distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3083
+#: src/libslic3r/PrintConfig.cpp:3463
 msgid ""
 "The max distance of two pillars to get linked with each other. A zero value "
 "will prohibit pillar cascading."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3093
+#: src/libslic3r/PrintConfig.cpp:3473
 msgid ""
 "How much the supports should lift up the supported object. If \"Pad around "
 "object\" is enabled, this value is ignored."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3104
+#: src/libslic3r/PrintConfig.cpp:3484
 msgid "This is a relative measure of support points density."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3110
+#: src/libslic3r/PrintConfig.cpp:3490
 msgid "Minimal distance of the support points"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3112
+#: src/libslic3r/PrintConfig.cpp:3492
 msgid "No support points will be placed closer than this threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3118
+#: src/libslic3r/PrintConfig.cpp:3498
 msgid "Use pad"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3120
+#: src/libslic3r/PrintConfig.cpp:3500
 msgid "Add a pad underneath the supported model"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3125
+#: src/libslic3r/PrintConfig.cpp:3505
 msgid "Pad wall thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3127
+#: src/libslic3r/PrintConfig.cpp:3507
 msgid "The thickness of the pad and its optional cavity walls."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3135
+#: src/libslic3r/PrintConfig.cpp:3515
 msgid "Pad wall height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3136
+#: src/libslic3r/PrintConfig.cpp:3516
 msgid ""
 "Defines the pad cavity depth. Set to zero to disable the cavity. Be careful "
 "when enabling this feature, as some resins may produce an extreme suction "
@@ -11364,111 +12814,111 @@ msgid ""
 "difficult."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3149
+#: src/libslic3r/PrintConfig.cpp:3529
 msgid "Pad brim size"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3150
+#: src/libslic3r/PrintConfig.cpp:3530
 msgid "How far should the pad extend around the contained geometry"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3160
+#: src/libslic3r/PrintConfig.cpp:3540
 msgid "Max merge distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3162
+#: src/libslic3r/PrintConfig.cpp:3542
 msgid ""
 "Some objects can get along with a few smaller pads instead of a single big "
 "one. This parameter defines how far the center of two smaller pads should "
 "be. If theyare closer, they will get merged into one pad."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3182
+#: src/libslic3r/PrintConfig.cpp:3562
 msgid "Pad wall slope"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3184
+#: src/libslic3r/PrintConfig.cpp:3564
 msgid ""
 "The slope of the pad wall relative to the bed plane. 90 degrees means "
 "straight walls."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3195
+#: src/libslic3r/PrintConfig.cpp:3575
 msgid "Create pad around object and ignore the support elevation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3200
+#: src/libslic3r/PrintConfig.cpp:3580
 msgid "Pad around object everywhere"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3202
+#: src/libslic3r/PrintConfig.cpp:3582
 msgid "Force pad around object everywhere"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3207
+#: src/libslic3r/PrintConfig.cpp:3587
 msgid "Pad object gap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3209
+#: src/libslic3r/PrintConfig.cpp:3589
 msgid ""
 "The gap between the object bottom and the generated pad in zero elevation "
 "mode."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3218
+#: src/libslic3r/PrintConfig.cpp:3598
 msgid "Pad object connector stride"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3220
+#: src/libslic3r/PrintConfig.cpp:3600
 msgid ""
 "Distance between two connector sticks which connect the object and the "
 "generated pad."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3227
+#: src/libslic3r/PrintConfig.cpp:3607
 msgid "Pad object connector width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3229
+#: src/libslic3r/PrintConfig.cpp:3609
 msgid ""
 "Width of the connector sticks which connect the object and the generated pad."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3236
+#: src/libslic3r/PrintConfig.cpp:3616
 msgid "Pad object connector penetration"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3239
+#: src/libslic3r/PrintConfig.cpp:3619
 msgid "How much should the tiny connectors penetrate into the model body."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3246
+#: src/libslic3r/PrintConfig.cpp:3626
 msgid "Enable hollowing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3248
+#: src/libslic3r/PrintConfig.cpp:3628
 msgid "Hollow out a model to have an empty interior"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3253
+#: src/libslic3r/PrintConfig.cpp:3633
 msgid "Wall thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3255
+#: src/libslic3r/PrintConfig.cpp:3635
 msgid "Minimum wall thickness of a hollowed model."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3263
+#: src/libslic3r/PrintConfig.cpp:3643
 msgid "Accuracy"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3265
+#: src/libslic3r/PrintConfig.cpp:3645
 msgid ""
 "Performance vs accuracy of calculation. Lower values may produce unwanted "
 "artifacts."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3275
+#: src/libslic3r/PrintConfig.cpp:3655
 msgid ""
 "Hollowing is done in two steps: first, an imaginary interior is calculated "
 "deeper (offset plus the closing distance) in the object and then it's "
@@ -11477,270 +12927,310 @@ msgid ""
 "most."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3683
+#: src/libslic3r/PrintConfig.cpp:4077
 msgid "Export OBJ"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3684
+#: src/libslic3r/PrintConfig.cpp:4078
 msgid "Export the model(s) as OBJ."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3695
+#: src/libslic3r/PrintConfig.cpp:4089
 msgid "Export SLA"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3696
+#: src/libslic3r/PrintConfig.cpp:4090
 msgid "Slice the model and export SLA printing layers as PNG."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3701
+#: src/libslic3r/PrintConfig.cpp:4095
 msgid "Export 3MF"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3702
+#: src/libslic3r/PrintConfig.cpp:4096
 msgid "Export the model(s) as 3MF."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3706
+#: src/libslic3r/PrintConfig.cpp:4100
 msgid "Export AMF"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3707
+#: src/libslic3r/PrintConfig.cpp:4101
 msgid "Export the model(s) as AMF."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3711
+#: src/libslic3r/PrintConfig.cpp:4105
 msgid "Export STL"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3712
+#: src/libslic3r/PrintConfig.cpp:4106
 msgid "Export the model(s) as STL."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3717
+#: src/libslic3r/PrintConfig.cpp:4111
 msgid "Slice the model and export toolpaths as G-code."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3722
+#: src/libslic3r/PrintConfig.cpp:4116
 msgid "G-code viewer"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3723
+#: src/libslic3r/PrintConfig.cpp:4117
 msgid "Visualize an already sliced and saved G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3728
+#: src/libslic3r/PrintConfig.cpp:4122
 msgid "Slice"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3729
+#: src/libslic3r/PrintConfig.cpp:4123
 msgid ""
 "Slice the model as FFF or SLA based on the printer_technology configuration "
 "value."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3734
+#: src/libslic3r/PrintConfig.cpp:4128
 msgid "Help"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3735
+#: src/libslic3r/PrintConfig.cpp:4129
 msgid "Show this help."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3740
+#: src/libslic3r/PrintConfig.cpp:4134
 msgid "Help (FFF options)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3741
+#: src/libslic3r/PrintConfig.cpp:4135
 msgid "Show the full list of print/G-code configuration options."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3745
+#: src/libslic3r/PrintConfig.cpp:4139
 msgid "Help (SLA options)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3746
+#: src/libslic3r/PrintConfig.cpp:4140
 msgid "Show the full list of SLA print configuration options."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3750
+#: src/libslic3r/PrintConfig.cpp:4144
 msgid "Output Model Info"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3751
+#: src/libslic3r/PrintConfig.cpp:4145
 msgid "Write information about the model to the console."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3755
+#: src/libslic3r/PrintConfig.cpp:4149
 msgid "Save config file"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3756
+#: src/libslic3r/PrintConfig.cpp:4150
 msgid "Save configuration to the specified file."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3766
+#: src/libslic3r/PrintConfig.cpp:4160
 msgid "Align XY"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3767
+#: src/libslic3r/PrintConfig.cpp:4161
 msgid "Align the model to the given point."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3772
+#: src/libslic3r/PrintConfig.cpp:4166
 msgid "Cut model at the given Z."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3793
+#: src/libslic3r/PrintConfig.cpp:4187
 msgid "Center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3794
+#: src/libslic3r/PrintConfig.cpp:4188
 msgid "Center the print around the given center."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3798
+#: src/libslic3r/PrintConfig.cpp:4192
 msgid "Don't arrange"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3799
+#: src/libslic3r/PrintConfig.cpp:4193
 msgid ""
 "Do not rearrange the given models before merging and keep their original XY "
 "coordinates."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3802
+#: src/libslic3r/PrintConfig.cpp:4196
+msgid "Ensure on bed"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4197
+msgid ""
+"Lift the object above the bed when it is partially below. Enabled by "
+"default, use --no-ensure-on-bed to disable."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4201
 msgid "Duplicate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3803
+#: src/libslic3r/PrintConfig.cpp:4202
 msgid "Multiply copies by this factor."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3807
+#: src/libslic3r/PrintConfig.cpp:4206
 msgid "Duplicate by grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3808
+#: src/libslic3r/PrintConfig.cpp:4207
 msgid "Multiply copies by creating a grid."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3812
+#: src/libslic3r/PrintConfig.cpp:4211
 msgid ""
 "Arrange the supplied models in a plate and merge them in a single model in "
 "order to perform actions once."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3817
+#: src/libslic3r/PrintConfig.cpp:4216
 msgid ""
 "Try to repair any non-manifold meshes (this option is implicitly added "
 "whenever we need to slice the model to perform the requested action)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3821
+#: src/libslic3r/PrintConfig.cpp:4220
 msgid "Rotation angle around the Z axis in degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3825
+#: src/libslic3r/PrintConfig.cpp:4224
 msgid "Rotate around X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3826
+#: src/libslic3r/PrintConfig.cpp:4225
 msgid "Rotation angle around the X axis in degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3830
+#: src/libslic3r/PrintConfig.cpp:4229
 msgid "Rotate around Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3831
+#: src/libslic3r/PrintConfig.cpp:4230
 msgid "Rotation angle around the Y axis in degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3836
+#: src/libslic3r/PrintConfig.cpp:4235
 msgid "Scaling factor or percentage."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3841
+#: src/libslic3r/PrintConfig.cpp:4240
 msgid ""
 "Detect unconnected parts in the given model(s) and split them into separate "
 "objects."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3844
+#: src/libslic3r/PrintConfig.cpp:4243
 msgid "Scale to Fit"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3845
+#: src/libslic3r/PrintConfig.cpp:4244
 msgid "Scale to fit the given volume."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3854
+#: src/libslic3r/PrintConfig.cpp:4253
 msgid "Ignore non-existent config files"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3855
+#: src/libslic3r/PrintConfig.cpp:4254
 msgid "Do not fail if a file supplied to --load does not exist."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3858
+#: src/libslic3r/PrintConfig.cpp:4257
+msgid ""
+"Forward-compatibility rule when loading configurations from config files and "
+"project files (3MF, AMF)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4258
+msgid ""
+"This version of PrusaSlicer may not understand configurations produced by "
+"newest PrusaSlicer versions. For example, newer PrusaSlicer may extend the "
+"list of supported firmware flavors. One may decide to bail out or to "
+"substitute an unknown value with a default silently or verbosely."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4265
+msgid "Bail out on unknown configuration values"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4266
+msgid ""
+"Enable reading unknown configuration values by verbosely substituting them "
+"with defaults."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4267
+msgid ""
+"Enable reading unknown configuration values by silently substituting them "
+"with defaults."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:4271
 msgid "Load config file"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3859
+#: src/libslic3r/PrintConfig.cpp:4272
 msgid ""
 "Load configuration from the specified file. It can be used more than once to "
 "load options from multiple files."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3862
+#: src/libslic3r/PrintConfig.cpp:4275
 msgid "Output File"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3863
+#: src/libslic3r/PrintConfig.cpp:4276
 msgid ""
 "The file where the output will be written (if not specified, it will be "
 "based on the input file)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3867
+#: src/libslic3r/PrintConfig.cpp:4280
 msgid "Single instance mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3868
+#: src/libslic3r/PrintConfig.cpp:4281
 msgid ""
 "If enabled, the command line arguments are sent to an existing instance of "
 "GUI PrusaSlicer, or an existing PrusaSlicer window is activated. Overrides "
 "the \"single_instance\" configuration value from application preferences."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3879
+#: src/libslic3r/PrintConfig.cpp:4292
 msgid "Data directory"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3880
+#: src/libslic3r/PrintConfig.cpp:4293
 msgid ""
 "Load and store settings at the given directory. This is useful for "
 "maintaining different profiles or including configurations from a network "
 "storage."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3883
+#: src/libslic3r/PrintConfig.cpp:4296
 msgid "Logging level"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3884
+#: src/libslic3r/PrintConfig.cpp:4297
 msgid ""
 "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:"
 "trace\n"
 "For example. loglevel=2 logs fatal, error and warning level messages."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3890
+#: src/libslic3r/PrintConfig.cpp:4303
 msgid "Render with a software renderer"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3891
+#: src/libslic3r/PrintConfig.cpp:4304
 msgid ""
 "Render with a software renderer. The bundled MESA software renderer is "
 "loaded instead of the default OpenGL driver."
@@ -11750,18 +13240,146 @@ msgstr ""
 msgid "Error with zip archive"
 msgstr ""
 
-#: src/libslic3r/PrintObject.cpp:112
-msgid "Processing triangulated mesh"
-msgstr ""
-
-#: src/libslic3r/PrintObject.cpp:157
+#: src/libslic3r/PrintObject.cpp:124
 msgid "Generating perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintObject.cpp:260
+#: src/libslic3r/PrintObject.cpp:227
 msgid "Preparing infill"
 msgstr ""
 
-#: src/libslic3r/PrintObject.cpp:421
+#: src/libslic3r/PrintObject.cpp:389
 msgid "Generating support material"
 msgstr ""
+
+#: resources/data/hints.ini: [hint:Fuzzy skin]
+msgid "Fuzzy skin\nDid you know that you can create rough fibre-like texture on the sides of your models using the<a>Fuzzy skin</a>feature? You can also use modifiers to apply fuzzy-skin only to a portion of your model."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Shapes gallery]
+msgid "Shapes gallery\nDid you know that PrusaSlicer has a Shapes Gallery? You can use the included models as modifiers, negative volumes or as printable objects. Right-click the platter and select<a>Add Shape - Gallery.</a>"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Auto-arrange settings]
+msgid "Auto-arrange settings\nDid you know that you can right-click the<a>auto-arrange icon</a>to adjust the size of the gap between objects and to allow automatic rotations?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Negative volume]
+msgid "Negative volume\nDid you know that you can subtract one mesh from another using the Negative volume modifier? That way you can, for example, create easily resizable holes directly in PrusaSlicer. Read more in the documentation. (Requires Advanced or Expert mode.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Simplify mesh]
+msgid "Simplify mesh\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model. Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Reload from disk]
+msgid "Reload from disk\nDid you know that if you created a newer version of your model, you can simply reload it in PrusaSlicer? Right-click the model in the 3D view and choose Reload from disk. Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Hiding sidebar]
+msgid "Hiding sidebar\nDid you know that you can hide the right sidebar using the shortcut <b>Shift+Tab</b>? You can also enable the icon for this from the<a>Preferences.</a>"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Perspective camera]
+msgid "Perspective camera\nDid you know that you can use the <b>K</b> key to quickly switch between an orthographic and perspective camera?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Camera Views]
+msgid "Camera Views\nDid you know that you can use the number keys <b>0-6</b> to quickly switch between predefined camera angles?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Place on face]
+msgid "Place on face\nDid you know that you can quickly orient a model so that one of its faces sits on the print bed? Select the<a>Place on face</a>function or press the <b>F</b> key."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Set number of instances]
+msgid "Set number of instances\nDid you know that you can right-click a model and set an exact number of instances instead of copy-pasting it several times?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Combine infill]
+msgid "Combine infill\nDid you know that you can print the infill with a higher layer height compared to perimeters to save print time using the setting<a>Combine infill every.</a>"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Variable layer height]
+msgid "Variable layer height\nDid you know that you can print different regions of your model with a different layer height and smooth the transitions between them? Try the<a>Variable layer height tool.</a>(Not available for SLA printers.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Undo/redo history]
+msgid "Undo/redo history\nDid you know that you can right-click the<a>undo/redo arrows</a>to see the history of changes and to undo or redo several actions at once?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Different layer height for each model]
+msgid "Different layer height for each model\nDid you know that you can print each model on the plater with a different layer height? Right-click the model in the 3D view, choose Layers and Perimeters and adjust the values in the right panel. Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Solid infill threshold area]
+msgid "Solid infill threshold area\nDid you know that you can make parts of your model with a small cross-section be filled with solid infill automatically? Set the<a>Solid infill threshold area.</a>(Expert mode only.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Search functionality]
+msgid "Search functionality\nDid you know that you use the<a>Search</a>tool to quickly find a specific PrusaSlicer setting? Or use the familiar shortcut <b>Ctrl+F</b>."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Box selection]
+msgid "Box selection\nDid you know that you can do a box selection with Shift+Mouse drag? You can also box-deselect objects with <b>Alt+Mouse drag</b>."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Zoom on selected objects or on all objects if none selected]
+msgid "Zoom on selected objects or on all objects if none selected\nDid you know that you can zoom in on selected objects by pressing the <b>Z</b> key? If none are selected, the camera will zoom on all objects in the scene."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Printable toggle]
+msgid "Printable toggle\nDid you know that you can disable the G-code generation for the selected model without having to move or delete it? Toggle the Printable property of a model from the Right-click context menu."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Mirror]
+msgid "Mirror\nDid you know that you can mirror the selected model to create a reversed version of it? Right-click the model, select Mirror and pick the mirror axis."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:PageUp / PageDown quick rotation by 45 degrees]
+msgid "PageUp / PageDown quick rotation by 45 degrees\nDid you know that you can quickly rotate selected models by 45 degrees around the Z-axis clockwise or counter-clockwise by pressing <b>Page Up</b> or <b>Page Down</b> respectively?"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Load config from G-code]
+msgid "Load config from G-code\nDid you know that you can use File-Import Config to load print, filament and printer profiles from an existing G-code file? Similarly, you can use File-Import SL1 archive, which also lets you reconstruct 3D models from the voxel data."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Ironing]
+msgid "Ironing\nDid you know that you can smooth top surfaces of prints using Ironing? The nozzle will run a special second infill phase at the same layer to fill in holes and flatten any lifted plastic. Read more in the documentation. (Requires Advanced or Expert mode.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Paint-on supports]
+msgid "Paint-on supports\nDid you know that you can paint directly on the object and select areas, where supports should be enforced or blocked? Try the<a>Paint-on supports</a>feature. (Requires Advanced or Expert mode.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Paint-on seam]
+msgid "Paint-on seam\nDid you know that you can paint directly on the object and select where to place the start/endpoint of each perimeter loop? Try the<a>Seam painting</a>feature. (Requires Advanced or Expert mode.)"
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Insert Pause]
+msgid "Insert Pause\nDid you know that you can schedule the print to pause at a specific layer? Right-click the layer slider in the Preview and select Add pause print (M601). This can be used to insert magnets, weights or nuts into your prints. Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Insert Custom G-code]
+msgid "Insert Custom G-code\nDid you know that you can insert a custom G-code at a specific layer? Right-click the layer in the Preview and select Add custom G-code. With this function you can, for example, create a temperature tower. Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Configuration snapshots]
+msgid "Configuration snapshots\nDid you know that roll back to a complete backup of all system and user profiles? You can view and move back and forth between snapshots using the Configuration - Configuration snapshots menu."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Minimum wall thickness]
+msgid "Minimum wall thickness\nDid you know that instead of the number of top and bottom layers, you can define the<a>Minimum shell thickness</a>in millimeters? This feature is especially useful when using the variable layer height function."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Settings in non-modal window]
+msgid "Settings in non-modal window\nDid you know that you can open the Settings in a new non-modal window? This means you can have settings open on one screen and the G-code Preview on the other. Go to the<a>Preferences</a>and select Settings in non-modal window."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Adaptive infills]
+msgid "Adaptive infills\nDid you know that you can use the Adaptive cubic and Support cubic infills to decrease the print time and lower the filament consumption? Read more in the documentation."
+msgstr ""
+
+#: resources/data/hints.ini: [hint:Fullscreen mode]
+msgid "Fullscreen mode\nDid you know that you can switch PrusaSlicer to fullscreen mode? Use the <b>F11</b> hotkey."
+msgstr ""
diff --git a/resources/localization/list.txt b/resources/localization/list.txt
index a2618b44e..2634761dd 100644
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -7,21 +7,25 @@ src/slic3r/GUI/ButtonsDescription.cpp
 src/slic3r/GUI/ConfigManipulation.cpp
 src/slic3r/GUI/ConfigSnapshotDialog.cpp
 src/slic3r/GUI/ConfigWizard.cpp
+src/slic3r/GUI/DesktopIntegrationDialog.cpp
 src/slic3r/GUI/DoubleSlider.cpp
 src/slic3r/GUI/ExtraRenderers.cpp
 src/slic3r/GUI/ExtruderSequenceDialog.cpp
 src/slic3r/GUI/Field.cpp
 src/slic3r/GUI/FirmwareDialog.cpp
+src/slic3r/GUI/GalleryDialog.cpp
 src/slic3r/GUI/GCodeViewer.cpp
 src/slic3r/GUI/GLCanvas3D.cpp
 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
 src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
+src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
 src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
 src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
 src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
 src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
 src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
@@ -34,9 +38,12 @@ src/slic3r/GUI/GUI_ObjectList.cpp
 src/slic3r/GUI/GUI_ObjectManipulation.cpp
 src/slic3r/GUI/GUI_ObjectSettings.cpp
 src/slic3r/GUI/GUI_Preview.cpp
+src/slic3r/GUI/HintNotification.cpp
 src/slic3r/GUI/ImGuiWrapper.cpp
 src/slic3r/GUI/Jobs/ArrangeJob.cpp
+src/slic3r/GUI/Jobs/FillBedJob.cpp
 src/slic3r/GUI/Jobs/Job.cpp
+src/slic3r/GUI/Jobs/PlaterJob.cpp
 src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
 src/slic3r/GUI/Jobs/SLAImportJob.cpp
 src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -59,6 +66,7 @@ src/slic3r/GUI/RammingChart.cpp
 src/slic3r/GUI/SavePresetDialog.cpp
 src/slic3r/GUI/Search.cpp
 src/slic3r/GUI/Selection.cpp
+src/slic3r/GUI/SendSystemInfoDialog.cpp
 src/slic3r/GUI/SysInfoDialog.cpp
 src/slic3r/GUI/Tab.cpp
 src/slic3r/GUI/Tab.hpp
@@ -74,6 +82,7 @@ src/slic3r/Utils/OctoPrint.cpp
 src/slic3r/Utils/PresetUpdater.cpp
 src/slic3r/Utils/Http.cpp
 src/slic3r/Utils/Process.cpp
+src/slic3r/Utils/Repetier.cpp
 src/libslic3r/GCode.cpp
 src/libslic3r/ExtrusionEntity.cpp
 src/libslic3r/Flow.cpp
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index 8a34a9a11..ee3a57fe8 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,181 +1,184 @@
-min_slic3r_version = 2.4.0-alpha0
-1.4.0-alpha7 Updated brim_separation value. Updated Prusa MINI end g-code. Added Filamentworld filament profiles. 
-1.4.0-alpha6 Added nozzle priming after M600. Added nozzle diameter checks for 0.8 nozzle printer profiles. Updated FW version. Increased number of top solid infill layers (0.2 layer height).
-1.4.0-alpha5 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
-1.4.0-alpha4 Decreased Area Fill (SL1S).
-1.4.0-alpha3 Updated SL1S tilt times.
-1.4.0-alpha2 Updated Prusa MINI machine limits.
-1.4.0-alpha1 Added new SL1S resin profiles.
-1.4.0-alpha0 Bumped up config version.
-1.3.0-alpha2 Added SL1S SPEED profiles.
-1.3.0-alpha1 Added Prusament PCCF. Increased travel acceleration for Prusa MINI. Updated start g-code for Prusa MINI. Added multiple add:north and Extrudr filament profiles. Updated Z travel speed values.
-1.3.0-alpha0 Disabled thick bridges, updated support settings.
-min_slic3r_version = 2.3.2-alpha0
-1.3.1 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
-1.3.0 Added SL1S SPEED profiles.
-min_slic3r_version = 2.3.0-rc1
-1.2.8 Added multiple add:north and Extrudr filament profiles.
-1.2.7 Updated "Prusament PC Blend Carbon Fiber" profile for Prusa MINI.
-1.2.6 Added filament profile for "Prusament PC Blend Carbon Fiber".
-1.2.5 Updated firmware version. Added filament profiles. Various improvements.
-1.2.4 Updated cost/density values in filament settings. Various changes in print settings.
-1.2.3 Updated firmware version. Updated end g-code in MMU2 printer profiles.
-1.2.2 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
-1.2.1 Updated FW version for MK2.5 family printers.
-1.2.0 Added full_fan_speed_layer value for PETG. Increased support interface spacing for 0.6mm nozzle profiles. Updated firmware version.
-min_slic3r_version = 2.3.0-beta2
-1.2.0-beta1 Updated end g-code. Added full_fan_speed_layer values.
-min_slic3r_version = 2.3.0-beta0
-1.2.0-beta0 Adjusted infill anchor limits. Added filament spool weights. 
-min_slic3r_version = 2.3.0-alpha4
-1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
-1.2.0-alpha0 Added filament spool weights
-min_slic3r_version = 2.2.0-alpha3
-1.1.14 Updated firmware version.
-1.1.13 Updated firmware version. Updated end g-code in MMU2 printer profiles.
-1.1.12 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
-1.1.11 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
-1.1.10 Updated firmware version.
-1.1.9 Updated K values in filament profiles (linear advance). Added new filament profiles and SLA materials.
-1.1.8 Updated start/end g-code scripts for MK3 family printer profiles (reduced extruder motor current for some print profiles). Added new filament and SLA material profiles.
-1.1.7 Updated end g-code for MMU2 Single printer profiles. Added/updated filament and SLA material profiles.
-1.1.6 Updated firmware version for MK2.5/S and MK3/S.
-1.1.5 Updated MMU1 specific retraction settings for Prusament PC Blend
-1.1.4 Added Prusament PC Blend filament profile.
-1.1.3 Added SLA material and filament profile
-1.1.2 Added renamed_from fields for PETG filaments to indicate that they were renamed from PET.
-1.1.1 Added Verbatim and Fiberlogy PETG filament profiles. Updated auto cooling settings for ABS.
-1.1.1-beta Updated for PrusaSlicer 2.2.0-beta
-1.1.1-alpha4 Extended list of default filaments to be installed, top/bottom_solid_min_thickness defined, infill_acceleration changed etc
-1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
-# The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
-# so they will see the print bed.
-max_slic3r_version = 2.2.0-alpha2
-min_slic3r_version = 2.2.0-alpha0
-1.1.1-alpha2 Bumped up config version, so our in house customer will get updated profiles.
-1.1.0 Filament aliases, Creality profiles and other goodies for PrusaSlicer 2.2.0-alpha0
-min_slic3r_version = 2.1.1-beta0
-1.0.12 Updated firmware version.
-1.0.11 Updated firmware version.
-1.0.10 Updated firmware version for MK2.5/S and MK3/S.
-1.0.9 Updated firmware version for MK2.5/S and MK3/S.
-1.0.8 Various changes in FFF profiles, new filaments/materials added. See changelog.
-1.0.7 Updated layer height limits for MINI
-1.0.6 Added Prusa MINI profiles
-min_slic3r_version = 2.1.0-alpha0
-1.0.5 Added SLA materials
-1.0.4 Updated firmware version and 0.25mm nozzle profiles
-1.0.3 Added filament profiles
-1.0.2 Added SLA materials
-1.0.1 Updated MK3 firmware version check to 3.8.0, new soluble support profiles for 0.6mm nozzle diameter MMU2S printers.
-1.0.0 Updated end G-code for the MMU2 profiles to lift the extruder at the end of print. Wipe tower bridging distance was made smaller for soluble supports.
-1.0.0-beta1 Updated color for the ASA filaments to differ from the other filaments. Single extruder printers now have no extruder color assigned, obects and toolpaths will be colored with the color of the active filament.
-1.0.0-beta0 Printer model checks in start G-codes, ASA filament profiles, limits on min / max SL1 exposition times
-1.0.0-alpha2 Printer model and nozzle diameter check
-1.0.0-alpha1 Added Prusament ASA profile
-1.0.0-alpha0 Filament specific retract for PET and similar copolymers, and for FLEX
-min_slic3r_version = 1.42.0-alpha6
-0.8.11 Updated firmware version.
-0.8.10 Updated firmware version.
-0.8.9 Updated firmware version for MK2.5/S and MK3/S.
-0.8.8 Updated firmware version for MK2.5/S and MK3/S.
-0.8.7 Updated firmware version
-0.8.6 Updated firmware version for MK2.5/S and MK3/S
-0.8.5 Updated SL1 printer and material settings
-0.8.4 Added Prusament ASA profile
-0.8.3 FW version and SL1 materials update
-0.8.2 FFF and SL1 settings update
-0.8.1 Output settings and SLA materials update
-0.8.0 Updated for the PrusaSlicer 2.0.0 final release
-0.8.0-rc2 Updated firmware versions for MK2.5/S and MK3/S
-0.8.0-rc1 Updated SLA profiles
-0.8.0-rc Updated for the PrusaSlicer 2.0.0-rc release
-0.8.0-beta4 Updated SLA profiles
-0.8.0-beta3 Updated SLA profiles
-0.8.0-beta2 Updated SLA profiles
-0.8.0-beta1 Updated SLA profiles
-0.8.0-beta Updated SLA profiles
-0.8.0-alpha9 Updated SLA and FFF profiles
-0.8.0-alpha8 Updated SLA profiles
-0.8.0-alpha7 Updated SLA profiles
-0.8.0-alpha6 Updated SLA profiles
-min_slic3r_version = 1.42.0-alpha
-0.8.0-alpha Updated SLA profiles
-0.4.0-alpha4 Updated SLA profiles
-0.4.0-alpha3 Update of SLA profiles
-0.4.0-alpha2 First SLA profiles
-min_slic3r_version = 1.41.3-alpha
-0.4.12 Updated firmware version for MK2.5/S and MK3/S.
-0.4.11 Updated firmware version for MK2.5/S and MK3/S.
-0.4.10 Updated firmware version
-0.4.9 Updated firmware version for MK2.5/S and MK3/S
-0.4.8 MK2.5/3/S FW update
-0.4.7 MK2/S/MMU FW update
-0.4.6 Updated firmware versions for MK2.5/S and MK3/S
-0.4.5 Enabled remaining time support for MK2/S/MMU1
-0.4.4 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
-0.4.3 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
-0.4.2 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
-0.4.1 New MK2.5S and MK3S FW versions
-0.4.0 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt 
-min_slic3r_version = 1.41.1
-0.3.11 Updated firmware version for MK2.5/S and MK3/S.
-0.3.10 Updated firmware version
-0.3.9 Updated firmware version for MK2.5/S and MK3/S
-0.3.8 MK2.5/3/S FW update
-0.3.7 MK2/S/MMU FW update
-0.3.6 Updated firmware versions for MK2.5 and MK3
-0.3.5 New MK2.5 and MK3 FW versions
-0.3.4 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt 
-0.3.3 Prusament PETG released
-0.3.2 New MK2.5 and MK3 FW versions
-0.3.1 New MK2.5 and MK3 FW versions
-0.3.0 New MK2.5 and MK3 FW version
-min_slic3r_version = 1.41.0-alpha
-0.2.9 New MK2.5 and MK3 FW versions
-0.2.8 New MK2.5 and MK3 FW version
-min_slic3r_version = 1.41.1
-0.2.7 New MK2.5 and MK3 FW version
-0.2.6 Added MMU2 MK2.5 settings
-min_slic3r_version = 1.41.0-alpha
-0.2.5 Prusament is out - added prusament settings
-0.2.4 Added soluble support profiles for MMU2
-0.2.3 Added materials for MMU2 single mode, edited MK3 xy stealth feedrate limit
-0.2.2 Edited MMU2 Single mode purge line
-0.2.1 Added PET and BVOH settings for MMU2
-0.2.0-beta5 Fixed MMU1 ramming parameters
-0.2.0-beta4 Added filament loading speed at start, increased minimal purge on wipe tower
-0.2.0-beta3 Edited ramming parameters and filament cooling moves for MMU2
-0.2.0-beta2 Edited first layer speed and wipe tower position
-0.2.0-beta Removed limit on the MK3MMU2 height, added legacy M204 S T format to the MK2 profiles
-0.2.0-alpha8 Added filament_load/unload_time for the PLA/ABS MMU2 filament presets.
-0.2.0-alpha7 Vojtech's fix the incorrect *MK3* references
-0.2.0-alpha6 Jindra's way to fix the 0.2.0-alpha5 version
-0.2.0-alpha5 Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
-0.2.0-alpha4 Extended the custom start/end G-codes of the MMU2.0 printers for no priming towers.
-0.2.0-alpha3 Adjusted machine limits for time estimates, added filament density and cost
-0.2.0-alpha2 Renamed the key MK3SMMU to MK3MMU2, added a generic PLA MMU2 material
-0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0
-0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters
-min_slic3r_version = 1.40.0
-0.1.18 Updated firmware version
-0.1.17 Updated firmware version for MK2.5/S and MK3/S
-0.1.16 MK2.5/3/S FW update
-0.1.15 MK2/S/MMU FW update
-0.1.14 Updated firmware versions for MK2.5 and MK3
-0.1.13 New MK2.5 and MK3 FW versions
-0.1.12 New MK2.5 and MK3 FW versions
-0.1.11 fw version changed to 3.3.1
-0.1.10 MK3 jerk and acceleration update
-0.1.9 edited support extrusion width for 0.25 and 0.6 nozzles
-0.1.8 extrusion width for 0,25, 0.6 and variable layer height fixes
-0.1.7 Fixed errors in 0.25mm and 0.6mm profiles
-0.1.6 Split the MK2.5 profile from the MK2S
-min_slic3r_version = 1.40.0-beta
-0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles
-0.1.4 edited fw version, added z-raise after print
-min_slic3r_version = 1.40.0-alpha
-0.1.3 Fixed an incorrect position of the max_print_height parameter
-0.1.2 Wipe tower changes
-0.1.1 Minor print speed adjustments
-0.1.0 Initial
+min_slic3r_version = 2.4.0-alpha0
+1.4.0-alpha8 Added material profiles for Prusament Resin. Detect bridging perimeters enabled by default. 
+1.4.0-alpha7 Updated brim_separation value. Updated Prusa MINI end g-code. Added Filamentworld filament profiles. 
+1.4.0-alpha6 Added nozzle priming after M600. Added nozzle diameter checks for 0.8 nozzle printer profiles. Updated FW version. Increased number of top solid infill layers (0.2 layer height).
+1.4.0-alpha5 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
+1.4.0-alpha4 Decreased Area Fill (SL1S).
+1.4.0-alpha3 Updated SL1S tilt times.
+1.4.0-alpha2 Updated Prusa MINI machine limits.
+1.4.0-alpha1 Added new SL1S resin profiles.
+1.4.0-alpha0 Bumped up config version.
+1.3.0-alpha2 Added SL1S SPEED profiles.
+1.3.0-alpha1 Added Prusament PCCF. Increased travel acceleration for Prusa MINI. Updated start g-code for Prusa MINI. Added multiple add:north and Extrudr filament profiles. Updated Z travel speed values.
+1.3.0-alpha0 Disabled thick bridges, updated support settings.
+min_slic3r_version = 2.3.2-alpha0
+1.3.2 Added material profiles for Prusament Resin.
+1.3.1 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
+1.3.0 Added SL1S SPEED profiles.
+min_slic3r_version = 2.3.0-rc1
+1.2.9 Added material profiles for Prusament Resin.
+1.2.8 Added multiple add:north and Extrudr filament profiles.
+1.2.7 Updated "Prusament PC Blend Carbon Fiber" profile for Prusa MINI.
+1.2.6 Added filament profile for "Prusament PC Blend Carbon Fiber".
+1.2.5 Updated firmware version. Added filament profiles. Various improvements.
+1.2.4 Updated cost/density values in filament settings. Various changes in print settings.
+1.2.3 Updated firmware version. Updated end g-code in MMU2 printer profiles.
+1.2.2 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
+1.2.1 Updated FW version for MK2.5 family printers.
+1.2.0 Added full_fan_speed_layer value for PETG. Increased support interface spacing for 0.6mm nozzle profiles. Updated firmware version.
+min_slic3r_version = 2.3.0-beta2
+1.2.0-beta1 Updated end g-code. Added full_fan_speed_layer values.
+min_slic3r_version = 2.3.0-beta0
+1.2.0-beta0 Adjusted infill anchor limits. Added filament spool weights. 
+min_slic3r_version = 2.3.0-alpha4
+1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
+1.2.0-alpha0 Added filament spool weights
+min_slic3r_version = 2.2.0-alpha3
+1.1.14 Updated firmware version.
+1.1.13 Updated firmware version. Updated end g-code in MMU2 printer profiles.
+1.1.12 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
+1.1.11 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
+1.1.10 Updated firmware version.
+1.1.9 Updated K values in filament profiles (linear advance). Added new filament profiles and SLA materials.
+1.1.8 Updated start/end g-code scripts for MK3 family printer profiles (reduced extruder motor current for some print profiles). Added new filament and SLA material profiles.
+1.1.7 Updated end g-code for MMU2 Single printer profiles. Added/updated filament and SLA material profiles.
+1.1.6 Updated firmware version for MK2.5/S and MK3/S.
+1.1.5 Updated MMU1 specific retraction settings for Prusament PC Blend
+1.1.4 Added Prusament PC Blend filament profile.
+1.1.3 Added SLA material and filament profile
+1.1.2 Added renamed_from fields for PETG filaments to indicate that they were renamed from PET.
+1.1.1 Added Verbatim and Fiberlogy PETG filament profiles. Updated auto cooling settings for ABS.
+1.1.1-beta Updated for PrusaSlicer 2.2.0-beta
+1.1.1-alpha4 Extended list of default filaments to be installed, top/bottom_solid_min_thickness defined, infill_acceleration changed etc
+1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
+# The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
+# so they will see the print bed.
+max_slic3r_version = 2.2.0-alpha2
+min_slic3r_version = 2.2.0-alpha0
+1.1.1-alpha2 Bumped up config version, so our in house customer will get updated profiles.
+1.1.0 Filament aliases, Creality profiles and other goodies for PrusaSlicer 2.2.0-alpha0
+min_slic3r_version = 2.1.1-beta0
+1.0.12 Updated firmware version.
+1.0.11 Updated firmware version.
+1.0.10 Updated firmware version for MK2.5/S and MK3/S.
+1.0.9 Updated firmware version for MK2.5/S and MK3/S.
+1.0.8 Various changes in FFF profiles, new filaments/materials added. See changelog.
+1.0.7 Updated layer height limits for MINI
+1.0.6 Added Prusa MINI profiles
+min_slic3r_version = 2.1.0-alpha0
+1.0.5 Added SLA materials
+1.0.4 Updated firmware version and 0.25mm nozzle profiles
+1.0.3 Added filament profiles
+1.0.2 Added SLA materials
+1.0.1 Updated MK3 firmware version check to 3.8.0, new soluble support profiles for 0.6mm nozzle diameter MMU2S printers.
+1.0.0 Updated end G-code for the MMU2 profiles to lift the extruder at the end of print. Wipe tower bridging distance was made smaller for soluble supports.
+1.0.0-beta1 Updated color for the ASA filaments to differ from the other filaments. Single extruder printers now have no extruder color assigned, obects and toolpaths will be colored with the color of the active filament.
+1.0.0-beta0 Printer model checks in start G-codes, ASA filament profiles, limits on min / max SL1 exposition times
+1.0.0-alpha2 Printer model and nozzle diameter check
+1.0.0-alpha1 Added Prusament ASA profile
+1.0.0-alpha0 Filament specific retract for PET and similar copolymers, and for FLEX
+min_slic3r_version = 1.42.0-alpha6
+0.8.11 Updated firmware version.
+0.8.10 Updated firmware version.
+0.8.9 Updated firmware version for MK2.5/S and MK3/S.
+0.8.8 Updated firmware version for MK2.5/S and MK3/S.
+0.8.7 Updated firmware version
+0.8.6 Updated firmware version for MK2.5/S and MK3/S
+0.8.5 Updated SL1 printer and material settings
+0.8.4 Added Prusament ASA profile
+0.8.3 FW version and SL1 materials update
+0.8.2 FFF and SL1 settings update
+0.8.1 Output settings and SLA materials update
+0.8.0 Updated for the PrusaSlicer 2.0.0 final release
+0.8.0-rc2 Updated firmware versions for MK2.5/S and MK3/S
+0.8.0-rc1 Updated SLA profiles
+0.8.0-rc Updated for the PrusaSlicer 2.0.0-rc release
+0.8.0-beta4 Updated SLA profiles
+0.8.0-beta3 Updated SLA profiles
+0.8.0-beta2 Updated SLA profiles
+0.8.0-beta1 Updated SLA profiles
+0.8.0-beta Updated SLA profiles
+0.8.0-alpha9 Updated SLA and FFF profiles
+0.8.0-alpha8 Updated SLA profiles
+0.8.0-alpha7 Updated SLA profiles
+0.8.0-alpha6 Updated SLA profiles
+min_slic3r_version = 1.42.0-alpha
+0.8.0-alpha Updated SLA profiles
+0.4.0-alpha4 Updated SLA profiles
+0.4.0-alpha3 Update of SLA profiles
+0.4.0-alpha2 First SLA profiles
+min_slic3r_version = 1.41.3-alpha
+0.4.12 Updated firmware version for MK2.5/S and MK3/S.
+0.4.11 Updated firmware version for MK2.5/S and MK3/S.
+0.4.10 Updated firmware version
+0.4.9 Updated firmware version for MK2.5/S and MK3/S
+0.4.8 MK2.5/3/S FW update
+0.4.7 MK2/S/MMU FW update
+0.4.6 Updated firmware versions for MK2.5/S and MK3/S
+0.4.5 Enabled remaining time support for MK2/S/MMU1
+0.4.4 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
+0.4.3 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
+0.4.2 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
+0.4.1 New MK2.5S and MK3S FW versions
+0.4.0 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt 
+min_slic3r_version = 1.41.1
+0.3.11 Updated firmware version for MK2.5/S and MK3/S.
+0.3.10 Updated firmware version
+0.3.9 Updated firmware version for MK2.5/S and MK3/S
+0.3.8 MK2.5/3/S FW update
+0.3.7 MK2/S/MMU FW update
+0.3.6 Updated firmware versions for MK2.5 and MK3
+0.3.5 New MK2.5 and MK3 FW versions
+0.3.4 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt 
+0.3.3 Prusament PETG released
+0.3.2 New MK2.5 and MK3 FW versions
+0.3.1 New MK2.5 and MK3 FW versions
+0.3.0 New MK2.5 and MK3 FW version
+min_slic3r_version = 1.41.0-alpha
+0.2.9 New MK2.5 and MK3 FW versions
+0.2.8 New MK2.5 and MK3 FW version
+min_slic3r_version = 1.41.1
+0.2.7 New MK2.5 and MK3 FW version
+0.2.6 Added MMU2 MK2.5 settings
+min_slic3r_version = 1.41.0-alpha
+0.2.5 Prusament is out - added prusament settings
+0.2.4 Added soluble support profiles for MMU2
+0.2.3 Added materials for MMU2 single mode, edited MK3 xy stealth feedrate limit
+0.2.2 Edited MMU2 Single mode purge line
+0.2.1 Added PET and BVOH settings for MMU2
+0.2.0-beta5 Fixed MMU1 ramming parameters
+0.2.0-beta4 Added filament loading speed at start, increased minimal purge on wipe tower
+0.2.0-beta3 Edited ramming parameters and filament cooling moves for MMU2
+0.2.0-beta2 Edited first layer speed and wipe tower position
+0.2.0-beta Removed limit on the MK3MMU2 height, added legacy M204 S T format to the MK2 profiles
+0.2.0-alpha8 Added filament_load/unload_time for the PLA/ABS MMU2 filament presets.
+0.2.0-alpha7 Vojtech's fix the incorrect *MK3* references
+0.2.0-alpha6 Jindra's way to fix the 0.2.0-alpha5 version
+0.2.0-alpha5 Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
+0.2.0-alpha4 Extended the custom start/end G-codes of the MMU2.0 printers for no priming towers.
+0.2.0-alpha3 Adjusted machine limits for time estimates, added filament density and cost
+0.2.0-alpha2 Renamed the key MK3SMMU to MK3MMU2, added a generic PLA MMU2 material
+0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0
+0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters
+min_slic3r_version = 1.40.0
+0.1.18 Updated firmware version
+0.1.17 Updated firmware version for MK2.5/S and MK3/S
+0.1.16 MK2.5/3/S FW update
+0.1.15 MK2/S/MMU FW update
+0.1.14 Updated firmware versions for MK2.5 and MK3
+0.1.13 New MK2.5 and MK3 FW versions
+0.1.12 New MK2.5 and MK3 FW versions
+0.1.11 fw version changed to 3.3.1
+0.1.10 MK3 jerk and acceleration update
+0.1.9 edited support extrusion width for 0.25 and 0.6 nozzles
+0.1.8 extrusion width for 0,25, 0.6 and variable layer height fixes
+0.1.7 Fixed errors in 0.25mm and 0.6mm profiles
+0.1.6 Split the MK2.5 profile from the MK2S
+min_slic3r_version = 1.40.0-beta
+0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles
+0.1.4 edited fw version, added z-raise after print
+min_slic3r_version = 1.40.0-alpha
+0.1.3 Fixed an incorrect position of the max_print_height parameter
+0.1.2 Wipe tower changes
+0.1.1 Minor print speed adjustments
+0.1.0 Initial
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 47a3883b4..7d4ab7ccb 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -5,7 +5,7 @@
 name = Prusa Research
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 1.4.0-alpha7
+config_version = 1.4.0-alpha8
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
 changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -120,7 +120,7 @@ technology = SLA
 family = SL1
 bed_model = sl1_bed.stl
 bed_texture = sl1.svg
-default_materials = Prusa Orange Tough @0.05
+default_materials = Prusa Orange Tough @0.05; Prusament Resin Tough Prusa Orange @0.05
 
 [printer_model:SL1S]
 name = Original Prusa SL1S SPEED
@@ -129,7 +129,7 @@ technology = SLA
 family = SL1
 bed_model = sl1s_bed.stl
 bed_texture = sl1s.svg
-default_materials = Prusa Orange Tough @0.05 SL1S
+default_materials = Prusa Orange Tough @0.05 SL1S; Prusament Resin Tough Prusa Orange @0.05 SL1S
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -181,7 +181,7 @@ max_volumetric_extrusion_rate_slope_positive = 0
 max_volumetric_speed = 0
 min_skirt_length = 4
 notes = 
-overhangs = 0
+overhangs = 1
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
 output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}_{print_time}.gcode
@@ -395,6 +395,7 @@ top_solid_min_thickness = 1.2
 bottom_solid_min_thickness = 0.8
 single_extruder_multi_material_priming = 0
 thick_bridges = 1
+overhangs = 0
 
 [print:*soluble_support*]
 overhangs = 1
@@ -460,10 +461,10 @@ bridge_flow_ratio = 1
 bridge_speed = 20
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4 and num_extruders==1
 layer_height = 0.1
-perimeter_acceleration = 800
+perimeter_acceleration = 600
 top_solid_layers = 9
 support_material_contact_distance = 0.17
-raft_contact_distance = 0.17
+raft_contact_distance = 0.15
 
 [print:*0.15mm*]
 inherits = *common*
@@ -619,6 +620,7 @@ support_material_contact_distance = 0.1
 raft_contact_distance = 0.2
 top_solid_infill_speed = 40
 thick_bridges = 1
+overhangs = 0
 
 ## MMU1 specific
 [print:0.15mm OPTIMAL SOLUBLE FULL]
@@ -704,7 +706,7 @@ small_perimeter_speed = 15
 solid_infill_speed = 40
 top_solid_infill_speed = 30
 support_material_contact_distance = 0.08
-raft_contact_distance = 0.08
+raft_contact_distance = 0.07
 
 ## MK2 - 0.6mm nozzle
 
@@ -772,6 +774,7 @@ single_extruder_multi_material_priming = 0
 inherits = 0.35mm FAST
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.5.*/ and nozzle_diameter[0]==0.4
 single_extruder_multi_material_priming = 0
+overhangs = 0
 
 ## MK2.5 - MMU2 specific
 
@@ -1013,7 +1016,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.08
-raft_contact_distance = 0.08
+raft_contact_distance = 0.07
 
 ## MK3 - 0.6mm nozzle
 
@@ -1028,7 +1031,7 @@ perimeter_speed = 45
 solid_infill_speed = 70
 top_solid_infill_speed = 45
 support_material_contact_distance = 0.22
-raft_contact_distance = 0.22
+raft_contact_distance = 0.2
 bridge_flow_ratio = 1
 
 [print:0.20mm DETAIL @0.6 nozzle MK3]
@@ -1042,7 +1045,7 @@ perimeter_speed = 45
 solid_infill_speed = 70
 top_solid_infill_speed = 45
 support_material_contact_distance = 0.22
-raft_contact_distance = 0.22
+raft_contact_distance = 0.2
 bridge_flow_ratio = 1
 
 [print:0.30mm QUALITY @0.6 nozzle MK3]
@@ -1311,7 +1314,7 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 fill_density = 20%
 support_material_contact_distance = 0.08
-raft_contact_distance = 0.08
+raft_contact_distance = 0.07
 
 # MINI - 0.6mm nozzle
 
@@ -4496,7 +4499,31 @@ initial_exposure_time = 35
 material_type = Tough
 material_vendor = Monocure
   
-## Prusa
+## Prusa Polymers 0.025
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.025]
+inherits = *common 0.025*
+exposure_time = 5
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.025]
+inherits = *common 0.025*
+exposure_time = 5
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.025]
+inherits = *common 0.025*
+exposure_time = 6
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+  
+## Prusa 0.025
+  
 [sla_material:Prusa Orange Tough @0.025]
 inherits = *common 0.025*
 exposure_time = 6
@@ -5185,7 +5212,30 @@ initial_exposure_time = 35
 material_type = Tough
 material_vendor = Zortrax
 
-## Prusa
+## Prusa Polymers 0.05
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.05]
+inherits = *common 0.05*
+exposure_time = 6
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.05]
+inherits = *common 0.05*
+exposure_time = 6
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.05]
+inherits = *common 0.05*
+exposure_time = 7
+initial_exposure_time = 35
+material_type = Tough
+material_vendor = Prusa Polymers
+
+## Prusa 0.05
 
 [sla_material:Prusa Beige Tough @0.05]
 inherits = *common 0.05*
@@ -5447,7 +5497,30 @@ initial_exposure_time = 50
 material_type = Tough
 material_vendor = BlueCast
 
-## Prusa
+## Prusa Polymers 0.1
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.1]
+inherits = *common 0.1*
+exposure_time = 13
+initial_exposure_time = 45
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.1]
+inherits = *common 0.1*
+exposure_time = 13
+initial_exposure_time = 45
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.1]
+inherits = *common 0.1*
+exposure_time = 14
+initial_exposure_time = 45
+material_type = Tough
+material_vendor = Prusa Polymers
+
+## Prusa 0.1
 
 [sla_material:Prusa Orange Tough @0.1]
 inherits = *common 0.1*
@@ -5530,6 +5603,31 @@ material_vendor = Made for Prusa
 
 ## 0.025 SL1S
 
+## Prusa Polymers 0.025
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.025 SL1S]
+inherits = *0.025_sl1s*
+exposure_time = 1.8
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.025 SL1S]
+inherits = *0.025_sl1s*
+exposure_time = 1.8
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.025 SL1S]
+inherits = *0.025_sl1s*
+exposure_time = 2
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+## Made for Prusa 0.025
+
 [sla_material:Prusa Orange Tough @0.025 SL1S]
 inherits = *0.025_sl1s*
 exposure_time = 1.8
@@ -5644,6 +5742,31 @@ material_vendor = Peopoly
 
 ## 0.05 SL1S
 
+## Prusa Polymers 0.05
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.05 SL1S]
+inherits = *0.05_sl1s*
+exposure_time = 2
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.05 SL1S]
+inherits = *0.05_sl1s*
+exposure_time = 2
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.05 SL1S]
+inherits = *0.05_sl1s*
+exposure_time = 2.4
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+## Made for Prusa 0.05
+
 [sla_material:Prusa Orange Tough @0.05 SL1S]
 inherits = *0.05_sl1s*
 exposure_time = 2
@@ -5758,6 +5881,31 @@ material_vendor = Peopoly
 
 ## 0.1 SL1S
 
+## Prusa Polymers 0.1
+
+[sla_material:Prusament Resin Tough Prusa Orange @0.1 SL1S]
+inherits = *0.1_sl1s*
+exposure_time = 2.6
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Rich Black @0.1 SL1S]
+inherits = *0.1_sl1s*
+exposure_time = 2.6
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+[sla_material:Prusament Resin Tough Anthracite Grey @0.1 SL1S]
+inherits = *0.1_sl1s*
+exposure_time = 3
+initial_exposure_time = 25
+material_type = Tough
+material_vendor = Prusa Polymers
+
+## Made for Prusa 0.1
+
 [sla_material:Prusa Orange Tough @0.1 SL1S]
 inherits = *0.1_sl1s*
 exposure_time = 2.6
@@ -6573,7 +6721,7 @@ nozzle_diameter = 0.6
 max_layer_height = 0.40
 min_layer_height = 0.15
 default_print_profile = 0.30mm QUALITY @0.6 nozzle MINI
-retract_length = 3.5
+retract_length = 3.2
 retract_before_travel = 1.5
 
 [printer:Original Prusa MINI & MINI+ 0.8 nozzle]
diff --git a/resources/shaders/gouraud_light_instanced.vs b/resources/shaders/gouraud_light_instanced.vs
index 997b6a2bf..a42f8e9a4 100644
--- a/resources/shaders/gouraud_light_instanced.vs
+++ b/resources/shaders/gouraud_light_instanced.vs
@@ -34,9 +34,7 @@ void main()
     float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0);
 
     intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
-	float width = 1.5 * i_scales.x;
-	float height = 1.5 * i_scales.y;
-    vec4 world_position = vec4(v_position * vec3(vec2(width), height) + i_offset - vec3(0.0, 0.0, 0.5 * i_scales.y), 1.0);
+    vec4 world_position = vec4(v_position * vec3(vec2(1.5 * i_scales.x), 1.5 * i_scales.y) + i_offset - vec3(0.0, 0.0, 0.5 * i_scales.y), 1.0);
     vec3 eye_position = (gl_ModelViewMatrix * world_position).xyz;
     intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(eye_position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS);
 
diff --git a/sandboxes/aabb-evaluation/aabb-evaluation.cpp b/sandboxes/aabb-evaluation/aabb-evaluation.cpp
index 9ec7451e5..1019ecf28 100644
--- a/sandboxes/aabb-evaluation/aabb-evaluation.cpp
+++ b/sandboxes/aabb-evaluation/aabb-evaluation.cpp
@@ -212,8 +212,7 @@ int main(const int argc, const char *argv[])
         return -1;
     }
 
-    mesh.repair();
-    if (mesh.facets_count() == 0) {
+    if (mesh.empty()) {
         std::cerr << "Error loading " << argv[1] << " . It is empty." << std::endl;
         return -1;
     }
diff --git a/sandboxes/meshboolean/MeshBoolean.cpp b/sandboxes/meshboolean/MeshBoolean.cpp
index 392d90707..c8649888f 100644
--- a/sandboxes/meshboolean/MeshBoolean.cpp
+++ b/sandboxes/meshboolean/MeshBoolean.cpp
@@ -24,7 +24,6 @@ int main(const int argc, const char * argv[])
     TriangleMesh input;
     
     input.ReadSTLFile(argv[1]);
-    input.repair();
     
     Benchmark bench;
     
diff --git a/sandboxes/opencsg/Engine.cpp b/sandboxes/opencsg/Engine.cpp
index f110b23c5..e64a47132 100644
--- a/sandboxes/opencsg/Engine.cpp
+++ b/sandboxes/opencsg/Engine.cpp
@@ -65,7 +65,7 @@ void CSGDisplay::render_scene()
     glFlush();
 }
 
-void Scene::set_print(uqptr<SLAPrint> &&print)
+void Scene::set_print(std::unique_ptr<SLAPrint> &&print)
 {   
     m_print = std::move(print);
         
@@ -85,7 +85,7 @@ void CSGDisplay::SceneCache::clear()
     primitives.clear();
 }
 
-shptr<Primitive> CSGDisplay::SceneCache::add_mesh(const TriangleMesh &mesh)
+std::shared_ptr<Primitive> CSGDisplay::SceneCache::add_mesh(const TriangleMesh &mesh)
 {
     auto p = std::make_shared<Primitive>();
     p->load_mesh(mesh);
@@ -94,7 +94,7 @@ shptr<Primitive> CSGDisplay::SceneCache::add_mesh(const TriangleMesh &mesh)
     return p;
 }
 
-shptr<Primitive> CSGDisplay::SceneCache::add_mesh(const TriangleMesh &mesh,
+std::shared_ptr<Primitive> CSGDisplay::SceneCache::add_mesh(const TriangleMesh &mesh,
                                                    OpenCSG::Operation  o,
                                                    unsigned            c)
 {
@@ -145,7 +145,7 @@ void IndexedVertexArray::load_mesh(const TriangleMesh &mesh)
     this->vertices_and_normals_interleaved.reserve(this->vertices_and_normals_interleaved.size() + 3 * 3 * 2 * mesh.facets_count());
     
     int vertices_count = 0;
-    for (size_t i = 0; i < mesh.stl.stats.number_of_facets; ++i) {
+    for (size_t i = 0; i < mesh.facets_count(); ++i) {
         const stl_facet &facet = mesh.stl.facet_start[i];
         for (int j = 0; j < 3; ++j)
             this->push_geometry(facet.vertex[j](0), facet.vertex[j](1), facet.vertex[j](2), facet.normal(0), facet.normal(1), facet.normal(2));
@@ -409,7 +409,6 @@ void CSGDisplay::on_scene_updated(const Scene &scene)
             interior.transform(po->trafo().inverse());
             
             mshinst.merge(interior);
-            mshinst.require_shared_vertices();
             
             mi->transform_mesh(&mshinst);
             
@@ -417,14 +416,12 @@ void CSGDisplay::on_scene_updated(const Scene &scene)
             auto center = bb.center().cast<float>();
             mshinst.translate(-center);
             
-            mshinst.require_shared_vertices();
             m_scene_cache.add_mesh(mshinst, OpenCSG::Intersection,
                                    m_csgsettings.get_convexity());
         }
         
         for (const sla::DrainHole &holept : holedata) {
             TriangleMesh holemesh = sla::to_triangle_mesh(holept.to_mesh());
-            holemesh.require_shared_vertices();
             m_scene_cache.add_mesh(holemesh, OpenCSG::Subtraction, 1);
         }
     }
diff --git a/sandboxes/opencsg/Engine.hpp b/sandboxes/opencsg/Engine.hpp
index fc76c1b31..114268ddc 100644
--- a/sandboxes/opencsg/Engine.hpp
+++ b/sandboxes/opencsg/Engine.hpp
@@ -17,11 +17,6 @@ class SLAPrint;
 
 namespace GL {
 
-// Simple shorthands for smart pointers
-template<class T> using shptr = std::shared_ptr<T>;
-template<class T> using uqptr = std::unique_ptr<T>;
-template<class T> using wkptr = std::weak_ptr<T>;
-
 template<class T, class A = std::allocator<T>> using vector = std::vector<T, A>;
 
 // remove empty weak pointers from a vector
@@ -61,7 +56,7 @@ public:
     };
     
 private:
-    vector<wkptr<Listener>> m_listeners;
+    vector<std::weak_ptr<Listener>> m_listeners;
         
 public:
     virtual ~MouseInput() = default;
@@ -95,7 +90,7 @@ public:
         call(&Listener::on_moved_to, m_listeners, x, y);
     }
     
-    void add_listener(shptr<Listener> listener)
+    void add_listener(std::shared_ptr<Listener> listener)
     {
         m_listeners.emplace_back(listener);
         cleanup(m_listeners);
@@ -322,7 +317,7 @@ public:
 // The scene is a wrapper around SLAPrint which holds the data to be visualized.
 class Scene
 {
-    uqptr<SLAPrint> m_print;
+    std::unique_ptr<SLAPrint> m_print;
 public:
     
     // Subscribers will be notified if the model is changed. This might be a
@@ -340,19 +335,19 @@ public:
     Scene();
     ~Scene();
     
-    void set_print(uqptr<SLAPrint> &&print);
+    void set_print(std::unique_ptr<SLAPrint> &&print);
     const SLAPrint * get_print() const { return m_print.get(); }
     
     BoundingBoxf3 get_bounding_box() const;
     
-    void add_listener(shptr<Listener> listener)
+    void add_listener(std::shared_ptr<Listener> listener)
     {
         m_listeners.emplace_back(listener);
         cleanup(m_listeners);
     }
     
 private:
-    vector<wkptr<Listener>> m_listeners;
+    vector<std::weak_ptr<Listener>> m_listeners;
 };
 
 // The basic Display. This is almost just an interface but will do all the
@@ -366,20 +361,20 @@ protected:
     Vec2i m_size;
     bool m_initialized = false;
     
-    shptr<Camera>  m_camera;
+    std::shared_ptr<Camera>  m_camera;
     FpsCounter m_fps_counter;
     
 public:
     
-    explicit Display(shptr<Camera> camera = nullptr)
+    explicit Display(std::shared_ptr<Camera> camera = nullptr)
         : m_camera(camera ? camera : std::make_shared<PerspectiveCamera>())
     {}
     
     ~Display() override;
     
-    shptr<const Camera> get_camera() const { return m_camera; }
-    shptr<Camera> get_camera() { return m_camera; }
-    void set_camera(shptr<Camera> cam) { m_camera = cam; }
+    std::shared_ptr<const Camera> get_camera() const { return m_camera; }
+    std::shared_ptr<Camera> get_camera() { return m_camera; }
+    void set_camera(std::shared_ptr<Camera> cam) { m_camera = cam; }
     
     virtual void swap_buffers() = 0;
     virtual void set_active(long width, long height);
@@ -410,14 +405,14 @@ protected:
     // Cache the renderable primitives. These will be fetched when the scene
     // is modified.
     struct SceneCache {
-        vector<shptr<Primitive>> primitives;
+        vector<std::shared_ptr<Primitive>> primitives;
         vector<Primitive *> primitives_free;
         vector<OpenCSG::Primitive *> primitives_csg;
         
         void clear();
         
-        shptr<Primitive> add_mesh(const TriangleMesh &mesh);
-        shptr<Primitive> add_mesh(const TriangleMesh &mesh,
+        std::shared_ptr<Primitive> add_mesh(const TriangleMesh &mesh);
+        std::shared_ptr<Primitive> add_mesh(const TriangleMesh &mesh,
                                   OpenCSG::Operation  op,
                                   unsigned            covexity);
     } m_scene_cache;
@@ -446,13 +441,13 @@ class Controller : public std::enable_shared_from_this<Controller>,
     Vec2i m_mouse_pos, m_mouse_pos_rprev, m_mouse_pos_lprev;
     bool m_left_btn = false, m_right_btn = false;
 
-    shptr<Scene>           m_scene;
-    vector<wkptr<Display>> m_displays;
+    std::shared_ptr<Scene>           m_scene;
+    vector<std::weak_ptr<Display>> m_displays;
     
     // Call a method of Camera on all the cameras of the attached displays
     template<class F, class...Args>
     void call_cameras(F &&f, Args&&... args) {
-        for (wkptr<Display> &l : m_displays)
+        for (std::weak_ptr<Display> &l : m_displays)
             if (auto disp = l.lock()) if (auto cam = disp->get_camera())
                 (cam.get()->*f)(std::forward<Args>(args)...);
     }
@@ -460,7 +455,7 @@ class Controller : public std::enable_shared_from_this<Controller>,
 public:
     
     // Set the scene that will be controlled.
-    void set_scene(shptr<Scene> scene)
+    void set_scene(std::shared_ptr<Scene> scene)
     {
         m_scene = scene;
         m_scene->add_listener(shared_from_this());
@@ -468,7 +463,7 @@ public:
     
     const Scene * get_scene() const { return m_scene.get(); }
 
-    void add_display(shptr<Display> disp)
+    void add_display(std::shared_ptr<Display> disp)
     {
         m_displays.emplace_back(disp);
         cleanup(m_displays);
diff --git a/sandboxes/opencsg/ShaderCSGDisplay.cpp b/sandboxes/opencsg/ShaderCSGDisplay.cpp
index 8ceb234be..2413bad5b 100644
--- a/sandboxes/opencsg/ShaderCSGDisplay.cpp
+++ b/sandboxes/opencsg/ShaderCSGDisplay.cpp
@@ -43,7 +43,6 @@ void ShaderCSGDisplay::on_scene_updated(const Scene &scene)
             interior.transform(po->trafo().inverse());
             
             mshinst.merge(interior);
-            mshinst.require_shared_vertices();
             
             mi->transform_mesh(&mshinst);
             
@@ -51,15 +50,11 @@ void ShaderCSGDisplay::on_scene_updated(const Scene &scene)
             auto center = bb.center().cast<float>();
             mshinst.translate(-center);
             
-            mshinst.require_shared_vertices();
             add_mesh(mshinst);
         }
         
-        for (const sla::DrainHole &holept : holedata) {
-            TriangleMesh holemesh = sla::to_triangle_mesh(holept.to_mesh());
-            holemesh.require_shared_vertices();
-            add_mesh(holemesh);
-        }
+        for (const sla::DrainHole &holept : holedata)
+            add_mesh(sla::to_triangle_mesh(holept.to_mesh()));
     }
     
     repaint();
diff --git a/sandboxes/opencsg/ShaderCSGDisplay.hpp b/sandboxes/opencsg/ShaderCSGDisplay.hpp
index bf0c3a424..0e2c763df 100644
--- a/sandboxes/opencsg/ShaderCSGDisplay.hpp
+++ b/sandboxes/opencsg/ShaderCSGDisplay.hpp
@@ -12,7 +12,7 @@ class CSGVolume: public Volume
 
 class ShaderCSGDisplay: public Display {
 protected:
-    vector<shptr<CSGVolume>> m_volumes;
+    vector<std::shared_ptr<CSGVolume>> m_volumes;
     
     void add_mesh(const TriangleMesh &mesh);
 public:
diff --git a/sandboxes/opencsg/main.cpp b/sandboxes/opencsg/main.cpp
index f5fb12493..f0627b974 100644
--- a/sandboxes/opencsg/main.cpp
+++ b/sandboxes/opencsg/main.cpp
@@ -34,7 +34,7 @@ using namespace Slic3r::GL;
 class Renderer {
 protected:
     wxGLCanvas *m_canvas;
-    shptr<wxGLContext> m_context;
+    std::shared_ptr<wxGLContext> m_context;
 public:
     
     Renderer(wxGLCanvas *c): m_canvas{c} {
@@ -86,16 +86,16 @@ public:
 class Canvas: public wxGLCanvas
 {    
     // One display is active at a time, the OCSGRenderer by default.
-    shptr<Slic3r::GL::Display> m_display;
+    std::shared_ptr<Slic3r::GL::Display> m_display;
     
 public:
     
     template<class...Args>
     Canvas(Args &&...args): wxGLCanvas(std::forward<Args>(args)...) {}
     
-    shptr<Slic3r::GL::Display> get_display() const { return m_display; }
+    std::shared_ptr<Slic3r::GL::Display> get_display() const { return m_display; }
 
-    void set_display(shptr<Slic3r::GL::Display> d) { m_display = d; }
+    void set_display(std::shared_ptr<Slic3r::GL::Display> d) { m_display = d; }
 };
 
 // Enumerate possible mouse events, we will record them.
@@ -197,14 +197,14 @@ public:
 class MyFrame: public wxFrame
 {
     // Instantiate the 3D engine.
-    shptr<Scene>             m_scene;             // Model
-    shptr<Canvas>            m_canvas;            // Views store
-    shptr<OCSGRenderer>      m_ocsgdisplay;       // View
-    shptr<ShaderCSGRenderer> m_shadercsg_display; // Another view
-    shptr<Controller>        m_ctl;               // Controller
+    std::shared_ptr<Scene>             m_scene;             // Model
+    std::shared_ptr<Canvas>            m_canvas;            // Views store
+    std::shared_ptr<OCSGRenderer>      m_ocsgdisplay;       // View
+    std::shared_ptr<ShaderCSGRenderer> m_shadercsg_display; // Another view
+    std::shared_ptr<Controller>        m_ctl;               // Controller
 
     // Add a status bar with progress indication.
-    shptr<Slic3r::GUI::ProgressStatusBar> m_stbar;
+    std::shared_ptr<Slic3r::GUI::ProgressStatusBar> m_stbar;
     
     RecorderMouseInput m_mouse;
     
@@ -237,7 +237,7 @@ class MyFrame: public wxFrame
         }
     };
     
-    uqptr<SLAJob> m_ui_job;
+    std::unique_ptr<SLAJob> m_ui_job;
     
     // To keep track of the running average of measured fps values.
     double m_fps_avg = 0.;
diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp
index 3490b8183..0da5e7380 100644
--- a/src/PrusaSlicer.cpp
+++ b/src/PrusaSlicer.cpp
@@ -397,7 +397,7 @@ int CLI::run(int argc, char **argv)
                 TriangleMesh mesh = model.mesh();
                 mesh.repair();
 
-                TriangleMeshPtrs meshes = mesh.cut_by_grid(m_config.option<ConfigOptionPoint>("cut_grid")->value);
+                std::vector<TriangleMesh> meshes = mesh.cut_by_grid(m_config.option<ConfigOptionPoint>("cut_grid")->value);
                 size_t i = 0;
                 for (TriangleMesh* m : meshes) {
                     Model out;
diff --git a/src/admesh/connect.cpp b/src/admesh/connect.cpp
index e5491b1aa..8c3ab154a 100644
--- a/src/admesh/connect.cpp
+++ b/src/admesh/connect.cpp
@@ -239,6 +239,7 @@ private:
 	    return edge_a.facet_number != edge_b.facet_number && edge_a == edge_b;
 	}
 
+	// Connect edge_a with edge_b, update edge connection statistics.
 	static void record_neighbors(stl_file *stl, const HashEdge &edge_a, const HashEdge &edge_b)
 	{
 		// Facet a's neighbor is facet b
@@ -249,7 +250,7 @@ private:
 		stl->neighbors_start[edge_b.facet_number].neighbor[edge_b.which_edge % 3] = edge_a.facet_number;	/* sets the .neighbor part */
 		stl->neighbors_start[edge_b.facet_number].which_vertex_not[edge_b.which_edge % 3] = (edge_a.which_edge + 2) % 3; /* sets the .which_vertex_not part */
 
-		if (((edge_a.which_edge < 3) && (edge_b.which_edge < 3)) || ((edge_a.which_edge > 2) && (edge_b.which_edge > 2))) {
+		if ((edge_a.which_edge < 3 && edge_b.which_edge < 3) || (edge_a.which_edge > 2 && edge_b.which_edge > 2)) {
 			// These facets are oriented in opposite directions, their normals are probably messed up.
 			stl->neighbors_start[edge_a.facet_number].which_vertex_not[edge_a.which_edge % 3] += 3;
 			stl->neighbors_start[edge_b.facet_number].which_vertex_not[edge_b.which_edge % 3] += 3;
@@ -479,12 +480,13 @@ void stl_check_facets_exact(stl_file *stl)
 
 void stl_check_facets_nearby(stl_file *stl, float tolerance)
 {
-  	if (  (stl->stats.connected_facets_1_edge == stl->stats.number_of_facets)
-       && (stl->stats.connected_facets_2_edge == stl->stats.number_of_facets)
-       && (stl->stats.connected_facets_3_edge == stl->stats.number_of_facets)) {
+	assert(stl->stats.connected_facets_3_edge <= stl->stats.connected_facets_2_edge);
+	assert(stl->stats.connected_facets_2_edge <= stl->stats.connected_facets_1_edge);
+	assert(stl->stats.connected_facets_1_edge <= stl->stats.number_of_facets);
+
+  	if (stl->stats.connected_facets_3_edge == stl->stats.number_of_facets)
     	// No need to check any further.  All facets are connected.
     	return;
-  	}
 
   	HashTableEdges hash_table(stl->stats.number_of_facets);
   	for (uint32_t i = 0; i < stl->stats.number_of_facets; ++ i) {
@@ -514,22 +516,12 @@ void stl_remove_unconnected_facets(stl_file *stl)
 		/* Update list of connected edges */
 		stl_neighbors &neighbors = stl->neighbors_start[facet_number];
 		// Update statistics on unconnected triangle edges.
-		switch ((neighbors.neighbor[0] == -1) + (neighbors.neighbor[1] == -1) + (neighbors.neighbor[2] == -1)) {
-		case 0: // Facet has 3 neighbors
-			-- stl->stats.connected_facets_3_edge;
-			-- stl->stats.connected_facets_2_edge;
-			-- stl->stats.connected_facets_1_edge;
-			break;
-		case 1: // Facet has 2 neighbors
-			-- stl->stats.connected_facets_2_edge;
-			-- stl->stats.connected_facets_1_edge;
-			break;
-		case 2: // Facet has 1 neighbor
-			-- stl->stats.connected_facets_1_edge;
-		case 3: // Facet has 0 neighbors
-			break;
-		default:
-			assert(false);
+		switch (neighbors.num_neighbors()) {
+		case 3: -- stl->stats.connected_facets_3_edge; // fall through
+		case 2: -- stl->stats.connected_facets_2_edge; // fall through
+		case 1: -- stl->stats.connected_facets_1_edge; // fall through
+		case 0: break;
+		default: assert(false);
 		}
 
 	  	if (facet_number < int(-- stl->stats.number_of_facets)) {
@@ -555,20 +547,14 @@ void stl_remove_unconnected_facets(stl_file *stl)
 
 	auto remove_degenerate = [stl, remove_facet](int facet)
 	{
-		// Update statistics on face connectivity.
-		auto stl_update_connects_remove_1 = [stl](int facet_num) {
-			//FIXME when decreasing 3_edge, should I increase 2_edge etc?
-			switch ((stl->neighbors_start[facet_num].neighbor[0] == -1) + (stl->neighbors_start[facet_num].neighbor[1] == -1) + (stl->neighbors_start[facet_num].neighbor[2] == -1)) {
-			case 0: // Facet has 3 neighbors
-				-- stl->stats.connected_facets_3_edge; break;
-			case 1: // Facet has 2 neighbors
-				-- stl->stats.connected_facets_2_edge; break;
-			case 2: // Facet has 1 neighbor
-				-- stl->stats.connected_facets_1_edge; break;
-			case 3: // Facet has 0 neighbors
-				break;
-			default:
-				assert(false);
+		// Update statistics on face connectivity after one edge was disconnected on the facet "facet_num".
+		auto update_connects_remove_1 = [stl](int facet_num) {
+			switch (stl->neighbors_start[facet_num].num_neighbors()) {
+			case 0: assert(false); break;
+			case 1: -- stl->stats.connected_facets_1_edge; break;
+			case 2: -- stl->stats.connected_facets_2_edge; break;
+			case 3: -- stl->stats.connected_facets_3_edge; break;
+			default: assert(false);
 		  	}
 		};
 
@@ -604,9 +590,9 @@ void stl_remove_unconnected_facets(stl_file *stl)
 
 		// Update statistics on edge connectivity.
 		if ((neighbor[0] == -1) && (neighbor[1] != -1))
-			stl_update_connects_remove_1(neighbor[1]);
+			update_connects_remove_1(neighbor[1]);
 		if ((neighbor[1] == -1) && (neighbor[0] != -1))
-			stl_update_connects_remove_1(neighbor[0]);
+			update_connects_remove_1(neighbor[0]);
 
 	  	if (neighbor[0] >= 0) {
 			if (neighbor[1] >= 0) {
@@ -634,7 +620,7 @@ void stl_remove_unconnected_facets(stl_file *stl)
 	    	stl->neighbors_start[neighbor[1]].which_vertex_not[(vnot[1] + 1) % 3] = vnot[0];
 	  	}
 		if (neighbor[2] >= 0) {
-			stl_update_connects_remove_1(neighbor[2]);
+			update_connects_remove_1(neighbor[2]);
 			stl->neighbors_start[neighbor[2]].neighbor[(vnot[2] + 1) % 3] = -1;
 		}
 
@@ -652,11 +638,9 @@ void stl_remove_unconnected_facets(stl_file *stl)
 			++ i;
 
 	if (stl->stats.connected_facets_1_edge < (int)stl->stats.number_of_facets) {
-		// remove completely unconnected facets
+		// There are some faces with no connected edge at all. Remove completely unconnected facets.
 		for (uint32_t i = 0; i < stl->stats.number_of_facets;)
-			if (stl->neighbors_start[i].neighbor[0] == -1 &&
-				stl->neighbors_start[i].neighbor[1] == -1 &&
-				stl->neighbors_start[i].neighbor[2] == -1) {
+			if (stl->neighbors_start[i].num_neighbors() == 0) {
 				// This facet is completely unconnected.  Remove it.
 				remove_facet(i);
 				assert(stl_validate(stl));
diff --git a/src/admesh/stl.h b/src/admesh/stl.h
index 1ca75c95d..8c30a6ae5 100644
--- a/src/admesh/stl.h
+++ b/src/admesh/stl.h
@@ -79,8 +79,7 @@ struct stl_neighbors {
   		which_vertex_not[1] = -1;
   		which_vertex_not[2] = -1;
   	}
-  	int num_neighbors_missing() const { return (this->neighbor[0] == -1) + (this->neighbor[1] == -1) + (this->neighbor[2] == -1); }
-  	int num_neighbors() const { return 3 - this->num_neighbors_missing(); }
+  	int num_neighbors() const { return 3 - ((this->neighbor[0] == -1) + (this->neighbor[1] == -1) + (this->neighbor[2] == -1)); }
 
   	// Index of a neighbor facet.
   	int   neighbor[3];
@@ -92,28 +91,44 @@ struct stl_stats {
     stl_stats() { memset(&header, 0, 81); }
     char          header[81];
     stl_type      type                      = (stl_type)0;
+    // Should always match the number of facets stored inside stl_file::facet_start.
     uint32_t      number_of_facets          = 0;
+    // Bounding box.
     stl_vertex    max                       = stl_vertex::Zero();
     stl_vertex    min                       = stl_vertex::Zero();
     stl_vertex    size                      = stl_vertex::Zero();
     float         bounding_diameter         = 0.f;
     float         shortest_edge             = 0.f;
+    // After repair, the volume shall always be positive.
     float         volume                    = -1.f;
+    // Number of face edges connected to another face.
+    // Don't use this statistics after repair, use the connected_facets_1/2/3_edge instead!
     int           connected_edges           = 0;
+    // Faces with >=1, >=2 and 3 edges connected to another face.
     int           connected_facets_1_edge   = 0;
     int           connected_facets_2_edge   = 0;
     int           connected_facets_3_edge   = 0;
+    // Faces with 1, 2 and 3 open edges after exact chaining, but before repair.
     int           facets_w_1_bad_edge       = 0;
     int           facets_w_2_bad_edge       = 0;
     int           facets_w_3_bad_edge       = 0;
+    // Number of faces read form an STL file.
     int           original_num_facets       = 0;
+    // Number of edges connected one to another by snapping their end vertices.
     int           edges_fixed               = 0;
+    // Number of faces removed because they were degenerated.
     int           degenerate_facets         = 0;
+    // Total number of facets removed: Degenerate faces and unconnected faces.
     int           facets_removed            = 0;
+    // Number of faces added by hole filling.
     int           facets_added              = 0;
+    // Number of faces reversed because of negative volume or because one patch was connected to another patch with incompatible normals.
     int           facets_reversed           = 0;
+    // Number of incompatible edges remaining after the patches were connected together and possibly their normals flipped.
     int           backwards_edges           = 0;
+    // Number of triangles, which were flipped during the fixing process.
     int           normals_fixed             = 0;
+    // Number of connected triangle patches.
     int           number_of_parts           = 0;
 
     void clear() { *this = stl_stats(); }
@@ -135,13 +150,11 @@ struct stl_file {
 	std::vector<stl_facet>     		facet_start;
 	std::vector<stl_neighbors> 		neighbors_start;
 	// Statistics
-	stl_stats     					      stats;
+	stl_stats     					stats;
 };
 
 struct indexed_triangle_set
 {
-	indexed_triangle_set() {}
-
 	void clear() { indices.clear(); vertices.clear(); }
 
 	size_t memsize() const {
@@ -149,9 +162,7 @@ struct indexed_triangle_set
 	}
 
 	std::vector<stl_triangle_vertex_indices> 	indices;
-    std::vector<stl_vertex>       				    vertices;
-	//FIXME add normals once we get rid of the stl_file from TriangleMesh completely.
-	//std::vector<stl_normal> 					      normals
+    std::vector<stl_vertex>       				vertices;
 
     bool empty() const { return indices.empty() || vertices.empty(); }
 };
@@ -244,9 +255,15 @@ inline void stl_transform(stl_file *stl, const Eigen::Matrix<T, 3, 3, Eigen::Don
 	stl_get_size(stl);
 }
 
+template<typename V>
+inline void its_translate(indexed_triangle_set &its, const V v)
+{
+  for (stl_vertex &v_dst : its.vertices)
+    v_dst += v;
+}
 
 template<typename T>
-extern void its_transform(indexed_triangle_set &its, T *trafo3x4)
+inline void its_transform(indexed_triangle_set &its, T *trafo3x4)
 {
 	for (stl_vertex &v_dst : its.vertices) {
 		stl_vertex  v_src = v_dst;
diff --git a/src/admesh/stl_io.cpp b/src/admesh/stl_io.cpp
index ddf377c78..26f5dc321 100644
--- a/src/admesh/stl_io.cpp
+++ b/src/admesh/stl_io.cpp
@@ -205,11 +205,12 @@ bool stl_write_quad_object(stl_file *stl, char *file)
 
   	fprintf(fp, "CQUAD\n");
   	for (uint32_t i = 0; i < stl->stats.number_of_facets; ++ i) {
-  		switch (stl->neighbors_start[i].num_neighbors_missing()) {
-  		case 0: color = connect_color; break;
-    	case 1: color = uncon_1_color; break;
-    	case 2: color = uncon_2_color; break;
-    	default: color = uncon_3_color;
+  		switch (stl->neighbors_start[i].num_neighbors()) {
+    		case 0:
+    		default: color = uncon_3_color; break;
+    		case 1:  color = uncon_2_color; break;
+    		case 2:  color = uncon_1_color; break;
+  		case 3:  color = connect_color; break;
 	    }
 	    fprintf(fp, "%f %f %f    %1.1f %1.1f %1.1f 1\n", stl->facet_start[i].vertex[0](0), stl->facet_start[i].vertex[0](1), stl->facet_start[i].vertex[0](2), color(0), color(1), color(2));
     	fprintf(fp, "%f %f %f    %1.1f %1.1f %1.1f 1\n", stl->facet_start[i].vertex[1](0), stl->facet_start[i].vertex[1](1), stl->facet_start[i].vertex[1](2), color(0), color(1), color(2));
diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h
index 713499a1b..c5627f16b 100644
--- a/src/imgui/imconfig.h
+++ b/src/imgui/imconfig.h
@@ -149,10 +149,11 @@ namespace ImGui
     const wchar_t CustomSupportsMarker     = 0x1D;
     const wchar_t CustomSeamMarker         = 0x1E;
     const wchar_t MmuSegmentationMarker    = 0x1F;
+    // Do not forget use following letters only in wstring
     const wchar_t DocumentationButton      = 0x2600;
     const wchar_t DocumentationHoverButton = 0x2601;
     const wchar_t ClippyMarker             = 0x2602;
-    
+    const wchar_t InfoMarker               = 0x2603;
         
 //    void MyFunction(const char* name, const MyMatrix44& v);
 }
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index 80024da1d..8999387f1 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -140,11 +140,17 @@ void AppConfig::set_defaults()
         if (get("default_action_on_select_preset").empty())
             set("default_action_on_select_preset", "none");     // , "transfer", "discard" or "save" 
 
+        if (get("default_action_on_new_project").empty())
+            set("default_action_on_new_project", "none");       // , "keep(transfer)", "discard" or "save" 
+
         if (get("color_mapinulation_panel").empty())
             set("color_mapinulation_panel", "0");
 
         if (get("order_volumes").empty())
             set("order_volumes", "1");
+
+        if (get("clear_undo_redo_stack_on_new_project").empty())
+            set("clear_undo_redo_stack_on_new_project", "1");
     }
     else {
 #ifdef _WIN32
diff --git a/src/libslic3r/BlacklistedLibraryCheck.cpp b/src/libslic3r/BlacklistedLibraryCheck.cpp
index 76f675c70..938f54249 100644
--- a/src/libslic3r/BlacklistedLibraryCheck.cpp
+++ b/src/libslic3r/BlacklistedLibraryCheck.cpp
@@ -12,7 +12,7 @@ namespace Slic3r {
 #ifdef  WIN32
 
 //only dll name with .dll suffix - currently case sensitive
-const std::vector<std::wstring> BlacklistedLibraryCheck::blacklist({ L"NahimicOSD.dll", L"SS2OSD.dll" });
+const std::vector<std::wstring> BlacklistedLibraryCheck::blacklist({ L"NahimicOSD.dll", L"SS2OSD.dll", L"amhook.dll", L"AMHook.dll" });
 
 bool BlacklistedLibraryCheck::get_blacklisted(std::vector<std::wstring>& names)
 {
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 4539efc8d..e4db50624 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -80,8 +80,6 @@ add_library(libslic3r STATIC
     Format/OBJ.hpp
     Format/objparser.cpp
     Format/objparser.hpp
-    Format/PRUS.cpp
-    Format/PRUS.hpp
     Format/STL.cpp
     Format/STL.hpp
     Format/SL1.hpp
diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp
index 8a4dfc03c..e8f87a6e3 100644
--- a/src/libslic3r/ClipperUtils.cpp
+++ b/src/libslic3r/ClipperUtils.cpp
@@ -126,6 +126,45 @@ ExPolygons ClipperPaths_to_Slic3rExPolygons(const ClipperLib::Paths &input)
     return PolyTreeToExPolygons(std::move(polytree));
 }
 
+#if 0
+// Global test.
+bool has_duplicate_points(const ClipperLib::PolyTree &polytree)
+{
+    struct Helper {
+        static void collect_points_recursive(const ClipperLib::PolyNode &polynode, ClipperLib::Path &out) {
+            // For each hole of the current expolygon:
+            out.insert(out.end(), polynode.Contour.begin(), polynode.Contour.end());
+            for (int i = 0; i < polynode.ChildCount(); ++ i)
+                collect_points_recursive(*polynode.Childs[i], out);
+        }
+    };
+    ClipperLib::Path pts;
+    for (int i = 0; i < polytree.ChildCount(); ++ i)
+        Helper::collect_points_recursive(*polytree.Childs[i], pts);
+    return has_duplicate_points(std::move(pts));
+}
+#else
+// Local test inside each of the contours.
+bool has_duplicate_points(const ClipperLib::PolyTree &polytree)
+{
+    struct Helper {
+        static bool has_duplicate_points_recursive(const ClipperLib::PolyNode &polynode) {
+            if (has_duplicate_points(polynode.Contour))
+                return true;
+            for (int i = 0; i < polynode.ChildCount(); ++ i)
+                if (has_duplicate_points_recursive(*polynode.Childs[i]))
+                    return true;
+            return false;
+        }
+    };
+    ClipperLib::Path pts;
+    for (int i = 0; i < polytree.ChildCount(); ++ i)
+        if (Helper::has_duplicate_points_recursive(*polytree.Childs[i]))
+            return true;
+    return false;
+}
+#endif
+
 // Offset outside by 10um, one by one.
 template<typename PathsProvider>
 static ClipperLib::Paths safety_offset(PathsProvider &&paths)
@@ -467,6 +506,8 @@ Slic3r::Polygons diff(const Slic3r::ExPolygons &subject, const Slic3r::Polygons
     { return _clipper(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); }
 Slic3r::Polygons diff(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset)
     { return _clipper(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); }
+Slic3r::Polygons intersection(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset)
+    { return _clipper(ClipperLib::ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); }
 Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset)
     { return _clipper(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); }
 Slic3r::Polygons intersection(const Slic3r::ExPolygon &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset)
@@ -496,6 +537,8 @@ Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::Surfac
     { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); }
 Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset)
     { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); }
+Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset)
+    { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); }
 Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset)
     { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); }
 Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset)
@@ -610,12 +653,18 @@ Polylines _clipper_pl_closed(ClipperLib::ClipType clipType, PathProvider1 &&subj
 
 Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip)
     { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); }
+Slic3r::Polylines diff_pl(const Slic3r::Polyline &subject, const Slic3r::ExPolygon &clip)
+    { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonProvider(clip)); }
 Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygon &clip)
     { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonProvider(clip)); }
 Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip)
     { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonsProvider(clip)); }
 Slic3r::Polylines diff_pl(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip)
     { return _clipper_pl_closed(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip)); }
+Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygon &clip)
+    { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::SinglePathProvider(clip.points)); }
+Slic3r::Polylines intersection_pl(const Slic3r::Polyline &subject, const Slic3r::Polygons &clip)
+    { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::PolygonsProvider(clip)); }
 Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip)
     { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); }
 Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip)
@@ -637,7 +686,9 @@ Lines _clipper_ln(ClipperLib::ClipType clipType, const Lines &subject, const Pol
     // convert Polylines to Lines
     Lines retval;
     for (Polylines::const_iterator polyline = polylines.begin(); polyline != polylines.end(); ++polyline)
-        retval.emplace_back(polyline->operator Line());
+        if (polyline->size() >= 2)
+            //FIXME It may happen, that Clipper produced a polyline with more than 2 collinear points by clipping a single line with polygons. It is a very rare issue, but it happens, see GH #6933.
+            retval.push_back({ polyline->front(), polyline->back() });
     return retval;
 }
 
diff --git a/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp
index c4e014a74..f49d922c1 100644
--- a/src/libslic3r/ClipperUtils.hpp
+++ b/src/libslic3r/ClipperUtils.hpp
@@ -303,6 +303,7 @@ Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::Polygo
 Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::Polygon &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
+Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
@@ -312,6 +313,7 @@ Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::Surf
 Slic3r::ExPolygons diff_ex(const Slic3r::Surfaces &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons diff_ex(const Slic3r::SurfacesPtr &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::Polylines  diff_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip);
+Slic3r::Polylines  diff_pl(const Slic3r::Polyline &subject, const Slic3r::ExPolygon &clip);
 Slic3r::Polylines  diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygon &clip);
 Slic3r::Polylines  diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip);
 Slic3r::Polylines  diff_pl(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip);
@@ -322,6 +324,7 @@ inline Slic3r::Lines diff_ln(const Slic3r::Lines &subject, const Slic3r::Polygon
 }
 
 // Safety offset is applied to the clipping polygons only.
+Slic3r::Polygons   intersection(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::Polygons   intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::Polygons   intersection(const Slic3r::ExPolygon &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::Polygons   intersection(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
@@ -337,6 +340,8 @@ Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r
 Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
 Slic3r::ExPolygons intersection_ex(const Slic3r::SurfacesPtr &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No);
+Slic3r::Polylines  intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygon &clip);
+Slic3r::Polylines  intersection_pl(const Slic3r::Polyline &subject, const Slic3r::Polygons &clip);
 Slic3r::Polylines  intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip);
 Slic3r::Polylines  intersection_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip);
 Slic3r::Polylines  intersection_pl(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip);
diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index ab58a43aa..2d4780d0e 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -740,7 +740,11 @@ ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, Fo
 }
 
 // Load the config keys from the given string.
-static inline size_t load_from_gcode_string_legacy(ConfigBase &config, const char *str, ConfigSubstitutionContext &substitutions)
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions)
+#else
+static inline size_t load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions)
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
 {
     if (str == nullptr)
         return 0;
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 6439e4632..dd121c90a 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -2015,6 +2015,10 @@ public:
 	// Set all the nullable values to nils.
     void null_nullables();
 
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+    static size_t load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions);
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+
 private:
     // Set a configuration value from a string.
     bool set_deserialize_raw(const t_config_option_key& opt_key_src, const std::string& value, ConfigSubstitutionContext& substitutions, bool append);
diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp
index 506ba8cb6..bfe0479fe 100644
--- a/src/libslic3r/ExPolygon.cpp
+++ b/src/libslic3r/ExPolygon.cpp
@@ -92,7 +92,7 @@ bool ExPolygon::contains(const Line &line) const
 
 bool ExPolygon::contains(const Polyline &polyline) const
 {
-    return diff_pl((Polylines)polyline, *this).empty();
+    return diff_pl(polyline, *this).empty();
 }
 
 bool ExPolygon::contains(const Polylines &polylines) const
@@ -114,10 +114,11 @@ bool ExPolygon::contains(const Polylines &polylines) const
 
 bool ExPolygon::contains(const Point &point) const
 {
-    if (!this->contour.contains(point)) return false;
-    for (Polygons::const_iterator it = this->holes.begin(); it != this->holes.end(); ++it) {
-        if (it->contains(point)) return false;
-    }
+    if (! this->contour.contains(point))
+        return false;
+    for (const Polygon &hole : this->holes)
+        if (hole.contains(point))
+            return false;
     return true;
 }
 
@@ -367,6 +368,57 @@ extern std::vector<BoundingBox> get_extents_vector(const ExPolygons &polygons)
     return out;
 }
 
+bool has_duplicate_points(const ExPolygon &expoly)
+{
+#if 1
+    // Check globally.
+    size_t cnt = expoly.contour.points.size();
+    for (const Polygon &hole : expoly.holes)
+        cnt += hole.points.size();
+    std::vector<Point> allpts;
+    allpts.reserve(cnt);
+    allpts.insert(allpts.begin(), expoly.contour.points.begin(), expoly.contour.points.end());
+    for (const Polygon &hole : expoly.holes)
+        allpts.insert(allpts.end(), hole.points.begin(), hole.points.end());
+    return has_duplicate_points(std::move(allpts));
+#else
+    // Check per contour.
+    if (has_duplicate_points(expoly.contour))
+        return true;
+    for (const Polygon &hole : expoly.holes)
+        if (has_duplicate_points(hole))
+            return true;
+    return false;
+#endif
+}
+
+bool has_duplicate_points(const ExPolygons &expolys)
+{
+#if 1
+    // Check globally.
+    size_t cnt = 0;
+    for (const ExPolygon &expoly : expolys) {
+        cnt += expoly.contour.points.size();
+        for (const Polygon &hole : expoly.holes)
+            cnt += hole.points.size();
+    }
+    std::vector<Point> allpts;
+    allpts.reserve(cnt);
+    for (const ExPolygon &expoly : expolys) {
+        allpts.insert(allpts.begin(), expoly.contour.points.begin(), expoly.contour.points.end());
+        for (const Polygon &hole : expoly.holes)
+            allpts.insert(allpts.end(), hole.points.begin(), hole.points.end());
+    }
+    return has_duplicate_points(std::move(allpts));
+#else
+    // Check per contour.
+    for (const ExPolygon &expoly : expolys)
+        if (has_duplicate_points(expoly))
+            return true;
+    return false;
+#endif
+}
+
 bool remove_sticks(ExPolygon &poly)
 {
     return remove_sticks(poly.contour) || remove_sticks(poly.holes);
diff --git a/src/libslic3r/ExPolygon.hpp b/src/libslic3r/ExPolygon.hpp
index 4e28fc6ec..3d094f965 100644
--- a/src/libslic3r/ExPolygon.hpp
+++ b/src/libslic3r/ExPolygon.hpp
@@ -353,20 +353,24 @@ inline ExPolygons expolygons_simplify(const ExPolygons &expolys, double toleranc
 	return out;
 }
 
-extern BoundingBox get_extents(const ExPolygon &expolygon);
-extern BoundingBox get_extents(const ExPolygons &expolygons);
-extern BoundingBox get_extents_rotated(const ExPolygon &poly, double angle);
-extern BoundingBox get_extents_rotated(const ExPolygons &polygons, double angle);
-extern std::vector<BoundingBox> get_extents_vector(const ExPolygons &polygons);
+BoundingBox get_extents(const ExPolygon &expolygon);
+BoundingBox get_extents(const ExPolygons &expolygons);
+BoundingBox get_extents_rotated(const ExPolygon &poly, double angle);
+BoundingBox get_extents_rotated(const ExPolygons &polygons, double angle);
+std::vector<BoundingBox> get_extents_vector(const ExPolygons &polygons);
 
-extern bool        remove_sticks(ExPolygon &poly);
-extern void 	   keep_largest_contour_only(ExPolygons &polygons);
+// Test for duplicate points. The points are copied, sorted and checked for duplicates globally.
+bool has_duplicate_points(const ExPolygon &expoly);
+bool has_duplicate_points(const ExPolygons &expolys);
+
+bool remove_sticks(ExPolygon &poly);
+void keep_largest_contour_only(ExPolygons &polygons);
 
 inline double      area(const ExPolygon &poly) { return poly.area(); }
 inline double      area(const ExPolygons &polys) { double s = 0.; for (auto &p : polys) s += p.area(); return s; }
 
 // Removes all expolygons smaller than min_area and also removes all holes smaller than min_area
-extern bool        remove_small_and_small_holes(ExPolygons &expolygons, double min_area);
+bool        remove_small_and_small_holes(ExPolygons &expolygons, double min_area);
 
 } // namespace Slic3r
 
diff --git a/src/libslic3r/Fill/FillAdaptive.cpp b/src/libslic3r/Fill/FillAdaptive.cpp
index 3eabc6106..29b343db0 100644
--- a/src/libslic3r/Fill/FillAdaptive.cpp
+++ b/src/libslic3r/Fill/FillAdaptive.cpp
@@ -928,7 +928,9 @@ static Polylines connect_lines_using_hooks(Polylines &&lines, const ExPolygon &b
                             Linef l { { bg::get<0, 0>(seg), bg::get<0, 1>(seg) }, { bg::get<1, 0>(seg), bg::get<1, 1>(seg) } };
                             assert(line_alg::distance_to_squared(l, Vec2d(pt.cast<double>())) > 1000 * 1000);
     #endif // NDEBUG
-                        } else if (((Line)pl).distance_to_squared(pt) <= 1000 * 1000)
+                        } else if (pl.size() >= 2 && 
+                            //FIXME Hoping that pl is really a line, trimmed by a polygon using ClipperUtils. Sometimes Clipper leaves some additional collinear points on the polyline, let's hope it is all right.
+                            Line{ pl.front(), pl.back() }.distance_to_squared(pt) <= 1000 * 1000)
                             out = closest.front().second;
                     }
                     return out;
diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp
index 544886a0f..acf250eaa 100644
--- a/src/libslic3r/Format/3mf.cpp
+++ b/src/libslic3r/Format/3mf.cpp
@@ -6,6 +6,7 @@
 #include "../GCode.hpp"
 #include "../Geometry.hpp"
 #include "../GCode/ThumbnailData.hpp"
+#include "../Semver.hpp"
 #include "../Time.hpp"
 
 #include "../I18N.hpp"
@@ -21,6 +22,7 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/spirit/include/karma.hpp>
+#include <boost/spirit/include/qi_int.hpp>
 #include <boost/log/trivial.hpp>
 
 #include <boost/property_tree/ptree.hpp>
@@ -34,6 +36,8 @@ namespace pt = boost::property_tree;
 
 #include "TextConfigurationSerialization.hpp"
 
+#include <fast_float/fast_float.h>
+
 // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter,
 // https://github.com/boostorg/spirit/pull/586
 // where the exported string is one digit shorter than it should be to guarantee lossless round trip.
@@ -133,6 +137,13 @@ static constexpr const char* SOURCE_OFFSET_Z_KEY = "source_offset_z";
 static constexpr const char* SOURCE_IN_INCHES    = "source_in_inches";
 static constexpr const char* SOURCE_IN_METERS    = "source_in_meters";
 
+static constexpr const char* MESH_STAT_EDGES_FIXED          = "edges_fixed";
+static constexpr const char* MESH_STAT_DEGENERATED_FACETS   = "degenerate_facets";
+static constexpr const char* MESH_STAT_FACETS_REMOVED       = "facets_removed";
+static constexpr const char* MESH_STAT_FACETS_RESERVED      = "facets_reversed";
+static constexpr const char* MESH_STAT_BACKWARDS_EDGES      = "backwards_edges";
+
+
 const unsigned int VALID_OBJECT_TYPES_COUNT = 1;
 const char* VALID_OBJECT_TYPES[] =
 {
@@ -175,14 +186,18 @@ std::string get_attribute_value_string(const char** attributes, unsigned int att
 
 float get_attribute_value_float(const char** attributes, unsigned int attributes_size, const char* attribute_key)
 {
-    const char* text = get_attribute_value_charptr(attributes, attributes_size, attribute_key);
-    return (text != nullptr) ? (float)::atof(text) : 0.0f;
+    float value = 0.0f;
+    if (const char *text = get_attribute_value_charptr(attributes, attributes_size, attribute_key); text != nullptr)
+        fast_float::from_chars(text, text + strlen(text), value);
+    return value;
 }
 
 int get_attribute_value_int(const char** attributes, unsigned int attributes_size, const char* attribute_key)
 {
-    const char* text = get_attribute_value_charptr(attributes, attributes_size, attribute_key);
-    return (text != nullptr) ? ::atoi(text) : 0;
+    int value = 0;
+    if (const char *text = get_attribute_value_charptr(attributes, attributes_size, attribute_key); text != nullptr)
+        boost::spirit::qi::parse(text, text + strlen(text), boost::spirit::qi::int_, value);
+    return value;
 }
 
 bool get_attribute_value_bool(const char** attributes, unsigned int attributes_size, const char* attribute_key)
@@ -301,8 +316,8 @@ namespace Slic3r {
 
         struct Geometry
         {
-            std::vector<float> vertices;
-            std::vector<unsigned int> triangles;
+            std::vector<Vec3f> vertices;
+            std::vector<Vec3i> triangles;
             std::vector<std::string> custom_supports;
             std::vector<std::string> custom_seam;
             std::vector<std::string> mmu_segmentation;
@@ -378,6 +393,7 @@ namespace Slic3r {
                 unsigned int first_triangle_id;
                 unsigned int last_triangle_id;
                 MetadataList metadata;
+                RepairedMeshErrors mesh_stats;
 
                 VolumeMetadata(unsigned int first_triangle_id, unsigned int last_triangle_id)
                     : first_triangle_id(first_triangle_id)
@@ -407,6 +423,8 @@ namespace Slic3r {
         unsigned int m_version;
         bool m_check_version;
 
+        // Semantic version of PrusaSlicer, that generated this 3MF.
+        boost::optional<Semver> m_prusaslicer_generator_version;
         unsigned int m_fdm_supports_painting_version = 0;
         unsigned int m_seam_painting_version         = 0;
         unsigned int m_mm_painting_version           = 0;
@@ -524,7 +542,9 @@ namespace Slic3r {
         bool _handle_end_config_object();
 
         bool _handle_start_config_volume(const char** attributes, unsigned int num_attributes);
+        bool _handle_start_config_volume_mesh(const char** attributes, unsigned int num_attributes);
         bool _handle_end_config_volume();
+        bool _handle_end_config_volume_mesh();
 
         bool _handle_start_config_metadata(const char** attributes, unsigned int num_attributes);
         bool _handle_end_config_metadata();
@@ -716,7 +736,7 @@ namespace Slic3r {
                     }
 
                     // use the geometry to create the volumes in the new model objects
-                    ObjectMetadata::VolumeMetadataList volumes(1, { 0, (unsigned int)geometry->triangles.size() / 3 - 1 });
+                    ObjectMetadata::VolumeMetadataList volumes(1, { 0, (unsigned int)geometry->triangles.size() - 1 });
 
                     // for each instance after the 1st, create a new model object containing only that instance
                     // and copy into it the geometry
@@ -789,7 +809,7 @@ namespace Slic3r {
                 // config data not found, this model was not saved using slic3r pe
 
                 // add the entire geometry as the single volume to generate
-                volumes.emplace_back(0, (int)obj_geometry->second.triangles.size() / 3 - 1);
+                volumes.emplace_back(0, (int)obj_geometry->second.triangles.size() - 1);
 
                 // select as volumes
                 volumes_ptr = &volumes;
@@ -1384,6 +1404,8 @@ namespace Slic3r {
             res = _handle_start_config_object(attributes, num_attributes);
         else if (::strcmp(VOLUME_TAG, name) == 0)
             res = _handle_start_config_volume(attributes, num_attributes);
+        else if (::strcmp(MESH_TAG, name) == 0)
+            res = _handle_start_config_volume_mesh(attributes, num_attributes);
         else if (::strcmp(METADATA_TAG, name) == 0)
             res = _handle_start_config_metadata(attributes, num_attributes);
 
@@ -1404,6 +1426,8 @@ namespace Slic3r {
             res = _handle_end_config_object();
         else if (::strcmp(VOLUME_TAG, name) == 0)
             res = _handle_end_config_volume();
+        else if (::strcmp(MESH_TAG, name) == 0)
+            res = _handle_end_config_volume_mesh();
         else if (::strcmp(METADATA_TAG, name) == 0)
             res = _handle_end_config_metadata();
 
@@ -1555,9 +1579,10 @@ namespace Slic3r {
     {
         // appends the vertex coordinates
         // missing values are set equal to ZERO
-        m_curr_object.geometry.vertices.push_back(m_unit_factor * get_attribute_value_float(attributes, num_attributes, X_ATTR));
-        m_curr_object.geometry.vertices.push_back(m_unit_factor * get_attribute_value_float(attributes, num_attributes, Y_ATTR));
-        m_curr_object.geometry.vertices.push_back(m_unit_factor * get_attribute_value_float(attributes, num_attributes, Z_ATTR));
+        m_curr_object.geometry.vertices.emplace_back(
+            m_unit_factor * get_attribute_value_float(attributes, num_attributes, X_ATTR),
+            m_unit_factor * get_attribute_value_float(attributes, num_attributes, Y_ATTR),
+            m_unit_factor * get_attribute_value_float(attributes, num_attributes, Z_ATTR));
         return true;
     }
 
@@ -1591,9 +1616,10 @@ namespace Slic3r {
 
         // appends the triangle's vertices indices
         // missing values are set equal to ZERO
-        m_curr_object.geometry.triangles.push_back((unsigned int)get_attribute_value_int(attributes, num_attributes, V1_ATTR));
-        m_curr_object.geometry.triangles.push_back((unsigned int)get_attribute_value_int(attributes, num_attributes, V2_ATTR));
-        m_curr_object.geometry.triangles.push_back((unsigned int)get_attribute_value_int(attributes, num_attributes, V3_ATTR));
+        m_curr_object.geometry.triangles.emplace_back(
+            get_attribute_value_int(attributes, num_attributes, V1_ATTR),
+            get_attribute_value_int(attributes, num_attributes, V2_ATTR),
+            get_attribute_value_int(attributes, num_attributes, V3_ATTR));
 
         m_curr_object.geometry.custom_supports.push_back(get_attribute_value_string(attributes, num_attributes, CUSTOM_SUPPORTS_ATTR));
         m_curr_object.geometry.custom_seam.push_back(get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR));
@@ -1706,21 +1732,20 @@ namespace Slic3r {
                 const std::string msg = (boost::format(_(L("The selected 3mf file has been saved with a newer version of %1% and is not compatible."))) % std::string(SLIC3R_APP_NAME)).str();
                 throw version_error(msg);
             }
-        }
-
-        if (m_curr_metadata_name == SLIC3RPE_FDM_SUPPORTS_PAINTING_VERSION) {
+        } else if (m_curr_metadata_name == "Application") {
+            // Generator application of the 3MF.
+            // SLIC3R_APP_KEY - SLIC3R_VERSION
+            if (boost::starts_with(m_curr_characters, "PrusaSlicer-"))
+                m_prusaslicer_generator_version = Semver::parse(m_curr_characters.substr(12));
+        } else if (m_curr_metadata_name == SLIC3RPE_FDM_SUPPORTS_PAINTING_VERSION) {
             m_fdm_supports_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
             check_painting_version(m_fdm_supports_painting_version, FDM_SUPPORTS_PAINTING_VERSION,
                 _(L("The selected 3MF contains FDM supports painted object using a newer version of PrusaSlicer and is not compatible.")));
-        }
-
-        if (m_curr_metadata_name == SLIC3RPE_SEAM_PAINTING_VERSION) {
+        } else if (m_curr_metadata_name == SLIC3RPE_SEAM_PAINTING_VERSION) {
             m_seam_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
             check_painting_version(m_seam_painting_version, SEAM_PAINTING_VERSION,
                 _(L("The selected 3MF contains seam painted object using a newer version of PrusaSlicer and is not compatible.")));
-        }
-
-        if (m_curr_metadata_name == SLIC3RPE_MM_PAINTING_VERSION) {
+        } else if (m_curr_metadata_name == SLIC3RPE_MM_PAINTING_VERSION) {
             m_mm_painting_version = (unsigned int) atoi(m_curr_characters.c_str());
             check_painting_version(m_mm_painting_version, MM_PAINTING_VERSION,
                 _(L("The selected 3MF contains multi-material painted object using a newer version of PrusaSlicer and is not compatible.")));
@@ -1837,12 +1862,43 @@ namespace Slic3r {
         return true;
     }
 
+    bool _3MF_Importer::_handle_start_config_volume_mesh(const char** attributes, unsigned int num_attributes)
+    {
+        IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id);
+        if (object == m_objects_metadata.end()) {
+            add_error("Cannot assign volume mesh to a valid object");
+            return false;
+        }
+        if (object->second.volumes.empty()) {
+            add_error("Cannot assign mesh to a valid olume");
+            return false;
+        }
+
+        ObjectMetadata::VolumeMetadata& volume = object->second.volumes.back();
+
+        int edges_fixed         = get_attribute_value_int(attributes, num_attributes, MESH_STAT_EDGES_FIXED       );
+        int degenerate_facets   = get_attribute_value_int(attributes, num_attributes, MESH_STAT_DEGENERATED_FACETS);
+        int facets_removed      = get_attribute_value_int(attributes, num_attributes, MESH_STAT_FACETS_REMOVED    );
+        int facets_reversed     = get_attribute_value_int(attributes, num_attributes, MESH_STAT_FACETS_RESERVED   );
+        int backwards_edges     = get_attribute_value_int(attributes, num_attributes, MESH_STAT_BACKWARDS_EDGES   );
+
+        volume.mesh_stats = { edges_fixed, degenerate_facets, facets_removed, facets_reversed, backwards_edges };
+
+        return true;
+    }
+
     bool _3MF_Importer::_handle_end_config_volume()
     {
         // do nothing
         return true;
     }
 
+    bool _3MF_Importer::_handle_end_config_volume_mesh()
+    {
+        // do nothing
+        return true;
+    }
+
     bool _3MF_Importer::_handle_start_config_metadata(const char** attributes, unsigned int num_attributes)
     {
         IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id);
@@ -1882,7 +1938,7 @@ namespace Slic3r {
             return false;
         }
 
-        unsigned int geo_tri_count = (unsigned int)geometry.triangles.size() / 3;
+        unsigned int geo_tri_count = (unsigned int)geometry.triangles.size();
         unsigned int renamed_volumes_count = 0;
 
         for (const ObjectMetadata::VolumeMetadata& volume_data : volumes) {
@@ -1893,77 +1949,78 @@ namespace Slic3r {
 
             Transform3d volume_matrix_to_object = Transform3d::Identity();
             bool        has_transform 		    = false;
-#if ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
-            bool        is_left_handed          = false;
-#endif // ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
             // extract the volume transformation from the volume's metadata, if present
             for (const Metadata& metadata : volume_data.metadata) {
                 if (metadata.key == MATRIX_KEY) {
                     volume_matrix_to_object = Slic3r::Geometry::transform3d_from_string(metadata.value);
                     has_transform 			= ! volume_matrix_to_object.isApprox(Transform3d::Identity(), 1e-10);
-#if ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
-                    is_left_handed          = Slic3r::Geometry::Transformation(volume_matrix_to_object).is_left_handed();
-#endif // ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
                     break;
                 }
             }
 
             // splits volume out of imported geometry
-			TriangleMesh triangle_mesh;
-            stl_file    &stl             = triangle_mesh.stl;
-			unsigned int triangles_count = volume_data.last_triangle_id - volume_data.first_triangle_id + 1;
-			stl.stats.type = inmemory;
-            stl.stats.number_of_facets = (uint32_t)triangles_count;
-            stl.stats.original_num_facets = (int)stl.stats.number_of_facets;
-            stl_allocate(&stl);
-
-            unsigned int src_start_id = volume_data.first_triangle_id * 3;
-
-            for (unsigned int i = 0; i < triangles_count; ++i) {
-                unsigned int ii = i * 3;
-                stl_facet& facet = stl.facet_start[i];
-                for (unsigned int v = 0; v < 3; ++v) {
-                    unsigned int tri_id = geometry.triangles[src_start_id + ii + v] * 3;
-                    if (tri_id + 2 >= geometry.vertices.size()) {
-                        add_error("Malformed triangle mesh");
-                        return false;
-                    }
-                    facet.vertex[v] = Vec3f(geometry.vertices[tri_id + 0], geometry.vertices[tri_id + 1], geometry.vertices[tri_id + 2]);
-                }
+            indexed_triangle_set its;
+            its.indices.assign(geometry.triangles.begin() + volume_data.first_triangle_id, geometry.triangles.begin() + volume_data.last_triangle_id + 1);
+            const size_t triangles_count = its.indices.size();
+            if (triangles_count == 0) {
+                add_error("An empty triangle mesh found");
+                return false;
             }
 
-			stl_get_size(&stl);
-			triangle_mesh.repair();
+            {
+                int min_id = its.indices.front()[0];
+                int max_id = min_id;
+                for (const Vec3i& face : its.indices) {
+                    for (const int tri_id : face) {
+                        if (tri_id < 0 || tri_id >= int(geometry.vertices.size())) {
+                            add_error("Found invalid vertex id");
+                            return false;
+                        }
+                        min_id = std::min(min_id, tri_id);
+                        max_id = std::max(max_id, tri_id);
+                    }
+                }
+                its.vertices.assign(geometry.vertices.begin() + min_id, geometry.vertices.begin() + max_id + 1);
 
-#if ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
-            // PrusaSlicer older than 2.4.0 saved mirrored volumes with reversed winding of the triangles
-            // This caused the call to TriangleMesh::repair() to reverse all the facets because the calculated volume was negative
-            if (is_left_handed && stl.stats.facets_reversed > 0 && stl.stats.facets_reversed == stl.stats.original_num_facets)
-                stl.stats.facets_reversed = 0;
-#endif // ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
+                // rebase indices to the current vertices list
+                for (Vec3i& face : its.indices)
+                    for (int& tri_id : face)
+                        tri_id -= min_id;
+            }
+
+            if (m_prusaslicer_generator_version && 
+                *m_prusaslicer_generator_version >= *Semver::parse("2.4.0-alpha1") &&
+                *m_prusaslicer_generator_version < *Semver::parse("2.4.0-alpha3"))
+                // PrusaSlicer 2.4.0-alpha2 contained a bug, where all vertices of a single object were saved for each volume the object contained.
+                // Remove the vertices, that are not referenced by any face.
+                its_compactify_vertices(its, true);
+
+            TriangleMesh triangle_mesh(std::move(its), volume_data.mesh_stats);
 
             if (m_version == 0) {
                 // if the 3mf was not produced by PrusaSlicer and there is only one instance,
                 // bake the transformation into the geometry to allow the reload from disk command
                 // to work properly
                 if (object.instances.size() == 1) {
-                    triangle_mesh.transform(object.instances.front()->get_transformation().get_matrix());
+                    triangle_mesh.transform(object.instances.front()->get_transformation().get_matrix(), false);
                     object.instances.front()->set_transformation(Slic3r::Geometry::Transformation());
+                    //FIXME do the mesh fixing?
                 }
             }
+            if (triangle_mesh.volume() < 0)
+                triangle_mesh.flip_triangles();
 
 			ModelVolume* volume = object.add_volume(std::move(triangle_mesh));
             // stores the volume matrix taken from the metadata, if present
             if (has_transform)
                 volume->source.transform = Slic3r::Geometry::Transformation(volume_matrix_to_object);
-            volume->calculate_convex_hull();
 
             // recreate custom supports, seam and mmu segmentation from previously loaded attribute
             volume->supported_facets.reserve(triangles_count);
             volume->seam_facets.reserve(triangles_count);
             volume->mmu_segmentation_facets.reserve(triangles_count);
-            for (unsigned i=0; i<triangles_count; ++i) {
-                size_t index = src_start_id/3 + i;
+            for (size_t i=0; i<triangles_count; ++i) {
+                size_t index = volume_data.first_triangle_id + i;
                 assert(index < geometry.custom_supports.size());
                 assert(index < geometry.custom_seam.size());
                 assert(index < geometry.mmu_segmentation.size());
@@ -2541,11 +2598,6 @@ namespace Slic3r {
             if (volume == nullptr)
                 continue;
 
-			if (!volume->mesh().repaired)
-				throw Slic3r::FileIOError("store_3mf() requires repair()");
-			if (!volume->mesh().has_shared_vertices())
-				throw Slic3r::FileIOError("store_3mf() requires shared vertices");
-
             volumes_offsets.insert({ volume, Offsets(vertices_count) });
 
             const indexed_triangle_set &its = volume->mesh().its;
@@ -2586,10 +2638,7 @@ namespace Slic3r {
             if (volume == nullptr)
                 continue;
 
-#if ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
             bool is_left_handed = volume->is_left_handed();
-#endif // ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
-
             VolumeToOffsetsMap::iterator volume_it = volumes_offsets.find(volume);
             assert(volume_it != volumes_offsets.end());
 
@@ -2604,7 +2653,6 @@ namespace Slic3r {
                 {
                     const Vec3i &idx = its.indices[i];
                     char *ptr = buf;
-#if ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
                     boost::spirit::karma::generate(ptr, boost::spirit::lit("     <") << TRIANGLE_TAG <<
                         " v1=\"" << boost::spirit::int_ <<
                         "\" v2=\"" << boost::spirit::int_ <<
@@ -2612,15 +2660,6 @@ namespace Slic3r {
                         idx[is_left_handed ? 2 : 0] + volume_it->second.first_vertex_id,
                         idx[1] + volume_it->second.first_vertex_id,
                         idx[is_left_handed ? 0 : 2] + volume_it->second.first_vertex_id);
-#else
-                    boost::spirit::karma::generate(ptr, boost::spirit::lit("     <") << TRIANGLE_TAG <<
-                        " v1=\"" << boost::spirit::int_ <<
-                        "\" v2=\"" << boost::spirit::int_ <<
-                        "\" v3=\"" << boost::spirit::int_ << "\"",
-                        idx[0] + volume_it->second.first_vertex_id,
-                        idx[1] + volume_it->second.first_vertex_id,
-                        idx[2] + volume_it->second.first_vertex_id);
-#endif // ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT
                     *ptr = '\0';
                     output_buffer += buf;
                 }
@@ -2998,9 +3037,10 @@ namespace Slic3r {
                             }
 
                             // stores volume's config data
-                            for (const std::string& key : volume->config.keys())
-                                add_metadata(stream, 3, MetadataType::volume, key, volume->config.opt_serialize(key));
-                            
+                            for (const std::string& key : volume->config.keys()) {
+                                stream << "   <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << volume->config.opt_serialize(key) << "\"/>\n";
+                            }
+
                             stream << "  </" << VOLUME_TAG << ">\n";
                         }
                     }
diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp
index 35b3e0cf4..bcc5c8b4a 100644
--- a/src/libslic3r/Format/AMF.cpp
+++ b/src/libslic3r/Format/AMF.cpp
@@ -244,11 +244,11 @@ struct AMFParserContext
     // Map from obect name to object idx & instances.
     std::map<std::string, Object> m_object_instances_map;
     // Vertices parsed for the current m_object.
-    std::vector<float>       m_object_vertices;
+    std::vector<Vec3f>       m_object_vertices;
     // Current volume allocated for an amf/object/mesh/volume subtree.
     ModelVolume             *m_volume { nullptr };
     // Faces collected for the current m_volume.
-    std::vector<int>         m_volume_facets;
+    std::vector<Vec3i>       m_volume_facets;
     // Transformation matrix of a volume mesh from its coordinate system to Object's coordinate system.
     Transform3d 			 m_volume_transform;
     // Current material allocated for an amf/metadata subtree.
@@ -598,9 +598,7 @@ void AMFParserContext::endElement(const char * /* name */)
     case NODE_TYPE_VERTEX:
         assert(m_object);
         // Parse the vertex data
-        m_object_vertices.emplace_back((float)atof(m_value[0].c_str()));
-        m_object_vertices.emplace_back((float)atof(m_value[1].c_str()));
-        m_object_vertices.emplace_back((float)atof(m_value[2].c_str()));
+        m_object_vertices.emplace_back(float(atof(m_value[0].c_str())), float(atof(m_value[1].c_str())), float(atof(m_value[2].c_str())));
         m_value[0].clear();
         m_value[1].clear();
         m_value[2].clear();
@@ -609,9 +607,7 @@ void AMFParserContext::endElement(const char * /* name */)
     // Faces of the current volume:
     case NODE_TYPE_TRIANGLE:
         assert(m_object && m_volume);
-        m_volume_facets.emplace_back(atoi(m_value[0].c_str()));
-        m_volume_facets.emplace_back(atoi(m_value[1].c_str()));
-        m_volume_facets.emplace_back(atoi(m_value[2].c_str()));
+        m_volume_facets.emplace_back(atoi(m_value[0].c_str()), atoi(m_value[1].c_str()), atoi(m_value[2].c_str()));
         m_value[0].clear();
         m_value[1].clear();
         m_value[2].clear();
@@ -621,39 +617,46 @@ void AMFParserContext::endElement(const char * /* name */)
     case NODE_TYPE_VOLUME:
     {
 		assert(m_object && m_volume);
-		TriangleMesh  mesh;
-        stl_file	 &stl = mesh.stl;
-        stl.stats.type = inmemory;
-        stl.stats.number_of_facets = int(m_volume_facets.size() / 3);
-        stl.stats.original_num_facets = stl.stats.number_of_facets;
-        stl_allocate(&stl);
+        if (m_volume_facets.empty()) {
+            this->stop("An empty triangle mesh found");
+            return;
+        }
 
-        bool has_transform = ! m_volume_transform.isApprox(Transform3d::Identity(), 1e-10);
-        for (size_t i = 0; i < m_volume_facets.size();) {
-            stl_facet &facet = stl.facet_start[i/3];
-            for (unsigned int v = 0; v < 3; ++v)
-            {
-                unsigned int tri_id = m_volume_facets[i++] * 3;
-                if (tri_id < 0 || tri_id + 2 >= m_object_vertices.size()) {
-                    this->stop("Malformed triangle mesh");
-                    return;
-                }
-                facet.vertex[v] = Vec3f(m_object_vertices[tri_id + 0], m_object_vertices[tri_id + 1], m_object_vertices[tri_id + 2]);
-            }
-        }        
-        stl_get_size(&stl);
-        mesh.repair();
-		m_volume->set_mesh(std::move(mesh));
-        // stores the volume matrix taken from the metadata, if present
-        if (has_transform)
-            m_volume->source.transform = Slic3r::Geometry::Transformation(m_volume_transform);
-        if (m_volume->source.input_file.empty() && (m_volume->type() == ModelVolumeType::MODEL_PART))
         {
+            // Verify validity of face indices, find the vertex span.
+            int min_id = m_volume_facets.front()[0];
+            int max_id = min_id;
+            for (const Vec3i& face : m_volume_facets) {
+                for (const int tri_id : face) {
+                    if (tri_id < 0 || tri_id >= int(m_object_vertices.size())) {
+                        this->stop("Malformed triangle mesh");
+                        return;
+                    }
+                    min_id = std::min(min_id, tri_id);
+                    max_id = std::max(max_id, tri_id);
+                }
+            }
+
+            // rebase indices to the current vertices list
+            for (Vec3i &face : m_volume_facets)
+                face -= Vec3i(min_id, min_id, min_id);
+
+            indexed_triangle_set its { std::move(m_volume_facets), { m_object_vertices.begin() + min_id, m_object_vertices.begin() + max_id + 1 } };
+            its_compactify_vertices(its);
+            if (its_volume(its) < 0)
+                its_flip_triangles(its);
+            m_volume->set_mesh(std::move(its));
+        }
+
+        // stores the volume matrix taken from the metadata, if present
+        if (bool has_transform = !m_volume_transform.isApprox(Transform3d::Identity(), 1e-10); has_transform)
+            m_volume->source.transform = Slic3r::Geometry::Transformation(m_volume_transform);
+
+        if (m_volume->source.input_file.empty() && (m_volume->type() == ModelVolumeType::MODEL_PART)) {
             m_volume->source.object_idx = (int)m_model.objects.size() - 1;
             m_volume->source.volume_idx = (int)m_model.objects.back()->volumes.size() - 1;
             m_volume->center_geometry_after_creation();
-        }
-        else
+        } else
             // pass false if the mesh offset has been already taken from the data 
             m_volume->center_geometry_after_creation(m_volume->source.input_file.empty());
 
@@ -1187,10 +1190,6 @@ bool store_amf(const char* path, Model* model, const DynamicPrintConfig* config,
         int              num_vertices = 0;
         for (ModelVolume *volume : object->volumes) {
             vertices_offsets.push_back(num_vertices);
-            if (! volume->mesh().repaired)
-                throw Slic3r::FileIOError("store_amf() requires repair()");
-			if (! volume->mesh().has_shared_vertices())
-				throw Slic3r::FileIOError("store_amf() requires shared vertices");
             const indexed_triangle_set &its = volume->mesh().its;
             const Transform3d& matrix = volume->get_matrix();
             for (size_t i = 0; i < its.vertices.size(); ++i) {
diff --git a/src/libslic3r/Format/OBJ.cpp b/src/libslic3r/Format/OBJ.cpp
index cb7eb4549..3b05bb574 100644
--- a/src/libslic3r/Format/OBJ.cpp
+++ b/src/libslic3r/Format/OBJ.cpp
@@ -19,7 +19,8 @@ namespace Slic3r {
 
 bool load_obj(const char *path, TriangleMesh *meshptr)
 {
-    if(meshptr == nullptr) return false;
+    if (meshptr == nullptr)
+        return false;
     
     // Parse the OBJ file.
     ObjParser::ObjData data;
@@ -31,84 +32,69 @@ bool load_obj(const char *path, TriangleMesh *meshptr)
     // Count the faces and verify, that all faces are triangular.
     size_t num_faces = 0;
     size_t num_quads = 0;
-    for (size_t i = 0; i < data.vertices.size(); ) {
+    for (size_t i = 0; i < data.vertices.size(); ++ i) {
+        // Find the end of face.
         size_t j = i;
         for (; j < data.vertices.size() && data.vertices[j].coordIdx != -1; ++ j) ;
-        if (i == j)
-            continue;
-        size_t face_vertices = j - i;
-        if (face_vertices != 3 && face_vertices != 4) {
-            // Non-triangular and non-quad faces are not supported as of now.
-            return false;
+        if (size_t num_face_vertices = j - i; num_face_vertices > 0) {
+            if (num_face_vertices > 4) {
+                // Non-triangular and non-quad faces are not supported as of now.
+                BOOST_LOG_TRIVIAL(error) << "load_obj: failed to parse " << path << ". The file contains polygons with more than 4 vertices.";
+                return false;
+            } else if (num_face_vertices < 3) {
+                // Non-triangular and non-quad faces are not supported as of now.
+                BOOST_LOG_TRIVIAL(error) << "load_obj: failed to parse " << path << ". The file contains polygons with less than 2 vertices.";
+                return false;
+            }
+            if (num_face_vertices == 4)
+                ++ num_quads;
+            ++ num_faces;
+            i = j;
         }
-        if (face_vertices == 4)
-            ++ num_quads;
-        ++ num_faces;
-        i = j + 1;
     }
     
-    // Convert ObjData into STL.
-    TriangleMesh &mesh = *meshptr;
-    stl_file &stl = mesh.stl;
-    stl.stats.type = inmemory;
-    stl.stats.number_of_facets = uint32_t(num_faces + num_quads);
-    stl.stats.original_num_facets = int(num_faces + num_quads);
-    // stl_allocate clears all the allocated data to zero, all normals are set to zeros as well.
-    stl_allocate(&stl);
-    size_t i_face = 0;
-    for (size_t i = 0; i < data.vertices.size(); ++ i) {
-        if (data.vertices[i].coordIdx == -1)
-            continue;
-        stl_facet &facet = stl.facet_start[i_face ++];
-        size_t     num_normals = 0;
-        stl_normal normal(stl_normal::Zero());
-        for (unsigned int v = 0; v < 3; ++ v) {
-            const ObjParser::ObjVertex &vertex = data.vertices[i++];
-            memcpy(facet.vertex[v].data(), &data.coordinates[vertex.coordIdx*4], 3 * sizeof(float));
-            if (vertex.normalIdx != -1) {
-                normal(0) += data.normals[vertex.normalIdx*3];
-                normal(1) += data.normals[vertex.normalIdx*3+1];
-                normal(2) += data.normals[vertex.normalIdx*3+2];
-                ++ num_normals;
-            }
-        }
-        // Result of obj_parseline() call is not checked, thus not all vertices are necessarily finalized with coord_Idx == -1.
-        if (i < data.vertices.size() && data.vertices[i].coordIdx != -1) {
-            // This is a quad. Produce the other triangle.
-            stl_facet &facet2 = stl.facet_start[i_face++];
-            facet2.vertex[0] = facet.vertex[0];
-            facet2.vertex[1] = facet.vertex[2];
-            const ObjParser::ObjVertex &vertex = data.vertices[i++];
-            memcpy(facet2.vertex[2].data(), &data.coordinates[vertex.coordIdx * 4], 3 * sizeof(float));
-            if (vertex.normalIdx != -1) {
-                normal(0) += data.normals[vertex.normalIdx*3];
-                normal(1) += data.normals[vertex.normalIdx*3+1];
-                normal(2) += data.normals[vertex.normalIdx*3+2];
-                ++ num_normals;
-            }
-            if (num_normals == 4) {
-                // Normalize an average normal of a quad.
-                float len = facet.normal.norm();
-                if (len > EPSILON) {
-                    normal /= len;
-                    facet.normal = normal;
-                    facet2.normal = normal;
-                }
-            }
-        } else if (num_normals == 3) {
-            // Normalize an average normal of a triangle.
-            float len = facet.normal.norm();
-            if (len > EPSILON)
-                facet.normal = normal / len;
-        }
+    // Convert ObjData into indexed triangle set.
+    indexed_triangle_set its;
+    size_t num_vertices = data.coordinates.size() / 4;
+    its.vertices.reserve(num_vertices);
+    its.indices.reserve(num_faces + num_quads);
+    for (size_t i = 0; i < num_vertices; ++ i) {
+        size_t j = i << 2;
+        its.vertices.emplace_back(data.coordinates[j], data.coordinates[j + 1], data.coordinates[j + 2]);
     }
-    stl_get_size(&stl);
-    mesh.repair();
-    if (mesh.facets_count() == 0) {
+    int indices[4];
+    for (size_t i = 0; i < data.vertices.size();)
+        if (data.vertices[i].coordIdx == -1)
+            ++ i;
+        else {
+            int cnt = 0;
+            while (i < data.vertices.size())
+                if (const ObjParser::ObjVertex &vertex = data.vertices[i ++]; vertex.coordIdx == -1) {
+                    break;
+                } else {
+                    assert(cnt < 4);
+                    if (vertex.coordIdx < 0 || vertex.coordIdx >= int(its.vertices.size())) {
+                        BOOST_LOG_TRIVIAL(error) << "load_obj: failed to parse " << path << ". The file contains invalid vertex index.";
+                        return false;
+                    }
+                    indices[cnt ++] = vertex.coordIdx;
+                }
+            if (cnt) {
+                assert(cnt == 3 || cnt == 4);
+                // Insert one or two faces (triangulate a quad).
+                its.indices.emplace_back(indices[0], indices[1], indices[2]);
+                if (cnt == 4)
+                    its.indices.emplace_back(indices[0], indices[2], indices[3]);
+            }
+        }
+
+    *meshptr = TriangleMesh(std::move(its));
+    if (meshptr->empty()) {
         BOOST_LOG_TRIVIAL(error) << "load_obj: This OBJ file couldn't be read because it's empty. " << path;
         return false;
     }
-    
+    if (meshptr->volume() < 0)
+        meshptr->flip_triangles();
     return true;
 }
 
diff --git a/src/libslic3r/Format/PRUS.cpp b/src/libslic3r/Format/PRUS.cpp
deleted file mode 100644
index 586fbafb5..000000000
--- a/src/libslic3r/Format/PRUS.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-#include <string.h>
-#include <exception>
-
-#include <boost/algorithm/string.hpp>
-
-#include "miniz_extension.hpp"
-
-#include <Eigen/Geometry>
-
-#include "../libslic3r.h"
-#include "../Model.hpp"
-
-#include "PRUS.hpp"
-
-#if 0
-// Enable debugging and assert in this file.
-#define DEBUG
-#define _DEBUG
-#undef NDEBUG
-#endif
-
-#include <assert.h>
-
-namespace Slic3r
-{
-
-struct StlHeader
-{
-    char        comment[80];
-    uint32_t    nTriangles;
-};
-
-static_assert(sizeof(StlHeader) == 84, "StlHeader size not correct");
-
-// Buffered line reader to a string buffer.
-class LineReader
-{
-public:
-    LineReader(std::vector<char> &data) : m_buffer(data), m_pos(0), m_len((int)data.size()) {}
-
-    const char* next_line() {
-        // Skip empty lines.
-        while (m_pos < m_len && (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n'))
-            ++ m_pos;
-        if (m_pos == m_len) {
-            // End of file.
-            return nullptr;
-        }
-        // The buffer is nonempty and it does not start with end of lines. Find the first end of line.
-        int end = m_pos + 1;
-        while (end < m_len && m_buffer[end] != '\r' && m_buffer[end] != '\n')
-            ++ end;
-        char *ptr_out = m_buffer.data() + m_pos;
-        m_pos = end + 1;
-        m_buffer[end] = 0;
-        return ptr_out;
-    }
-
-    int next_line_scanf(const char *format, ...)
-    {
-        const char *line = next_line();
-        if (line == nullptr)
-            return -1;
-        int result;
-        va_list arglist;
-        va_start(arglist, format);
-        result = vsscanf(line, format, arglist);
-        va_end(arglist);
-        return result;
-    }
-
-private:
-    std::vector<char>  &m_buffer;
-    int                 m_pos;
-    int                 m_len;
-};
-
-static void extract_model_from_archive(
-    // name of the model file
-    const char              *name,
-    // path to the archive
-    const char              *path,
-    // content of scene.xml
-    const std::vector<char> &scene_xml_data,
-    // loaded data of this STL
-    std::vector<char>       &data,
-    // Model, to which the newly loaded objects will be added
-    Model                   *model,
-    // To map multiple STLs into a single model object for multi-material prints.
-    std::map<int, ModelObject*> &group_to_model_object)
-{
-    // Find the model entry in the XML data.
-    char model_name_tag[1024];
-    sprintf(model_name_tag, "<model name=\"%s\">", name);
-    const char *model_xml = strstr(scene_xml_data.data(), model_name_tag);
-    const char *zero_tag  = "<zero>";
-    const char *zero_xml  = strstr(scene_xml_data.data(), zero_tag);
-    Vec3d instance_rotation = Vec3d::Zero();
-    Vec3d instance_scaling_factor = Vec3d::Ones();
-    Vec3d instance_offset = Vec3d::Zero();
-    bool         trafo_set    = false;
-    unsigned int group_id     = (unsigned int)-1;
-    unsigned int extruder_id  = (unsigned int)-1;
-    ModelObject *model_object = nullptr;
-    if (model_xml != nullptr) {
-        model_xml += strlen(model_name_tag);
-        const char *position_tag = "<position>";
-        const char *position_xml = strstr(model_xml, position_tag);
-        const char *rotation_tag = "<rotation>";
-        const char *rotation_xml = strstr(model_xml, rotation_tag);
-        const char *scale_tag    = "<scale>";
-        const char *scale_xml    = strstr(model_xml, scale_tag);
-        float position[3], rotation[3], scale[3], zero[3];
-        if (position_xml != nullptr && rotation_xml != nullptr && scale_xml != nullptr && zero_xml != nullptr &&
-            sscanf(position_xml+strlen(position_tag), 
-                "[%f, %f, %f]", position, position+1, position+2) == 3 &&
-            sscanf(rotation_xml+strlen(rotation_tag), 
-                "[%f, %f, %f]", rotation, rotation+1, rotation+2) == 3 &&
-            sscanf(scale_xml+strlen(scale_tag),
-                "[%f, %f, %f]", scale, scale+1, scale+2) == 3 &&
-            sscanf(zero_xml+strlen(zero_tag), 
-                "[%f, %f, %f]", zero, zero+1, zero+2) == 3) {
-            instance_scaling_factor = Vec3d((double)scale[0], (double)scale[1], (double)scale[2]);
-            instance_rotation = Vec3d(-(double)rotation[0], -(double)rotation[1], -(double)rotation[2]);
-            instance_offset = Vec3d((double)(position[0] - zero[0]), (double)(position[1] - zero[1]), (double)(position[2] - zero[2]));
-            trafo_set = true;
-        }
-        const char *group_tag    = "<group>";
-        const char *group_xml    = strstr(model_xml, group_tag);
-        const char *extruder_tag = "<extruder>";
-        const char *extruder_xml = strstr(model_xml, extruder_tag);
-        if (group_xml != nullptr) {
-            int group = atoi(group_xml + strlen(group_tag));
-            if (group > 0) {
-                group_id = group;
-                auto it = group_to_model_object.find(group_id);
-                if (it != group_to_model_object.end())
-                    model_object = it->second;
-            }
-        }
-        if (extruder_xml != nullptr) {
-            int e = atoi(extruder_xml + strlen(extruder_tag));
-            if (e > 0)
-            extruder_id = e;
-        }
-    }
-    if (! trafo_set)
-        throw Slic3r::FileIOError(std::string("Archive ") + path + " does not contain a valid entry in scene.xml for " + name);
-
-    // Extract the STL.
-    StlHeader header;
-    TriangleMesh mesh;
-    bool mesh_valid = false;
-    bool stl_ascii  = false;
-    if (data.size() > sizeof(StlHeader)) {
-        memcpy((char*)&header, data.data(), sizeof(StlHeader));
-        if (strncmp(header.comment, "solid ", 6) == 0)
-            stl_ascii = true;
-        else {
-            // Header has been extracted. Now read the faces.
-            stl_file &stl = mesh.stl;
-            stl.stats.type = inmemory;
-            stl.stats.number_of_facets = header.nTriangles;
-            stl.stats.original_num_facets = header.nTriangles;
-            stl_allocate(&stl);
-            if (header.nTriangles > 0 && data.size() == 50 * header.nTriangles + sizeof(StlHeader)) {
-                memcpy((char*)stl.facet_start.data(), data.data() + sizeof(StlHeader), 50 * header.nTriangles);
-                if (sizeof(stl_facet) > SIZEOF_STL_FACET) {
-                    // The stl.facet_start is not packed tightly. Unpack the array of stl_facets.
-                    unsigned char *data = (unsigned char*)stl.facet_start.data();
-                    for (size_t i = header.nTriangles - 1; i > 0; -- i)
-                        memmove(data + i * sizeof(stl_facet), data + i * SIZEOF_STL_FACET, SIZEOF_STL_FACET);
-                }
-                // All the faces have been read.
-                stl_get_size(&stl);
-                mesh.repair();
-                if (std::abs(stl.stats.min(2)) < EPSILON)
-                    stl.stats.min(2) = 0.;
-                // Add a mesh to a model.
-                if (mesh.facets_count() > 0)
-                    mesh_valid = true;
-            }
-        }
-    } else
-        stl_ascii = true;
-
-    if (stl_ascii) {
-        // Try to parse ASCII STL.
-        char                    normal_buf[3][32];
-        stl_facet               facet;
-        std::vector<stl_facet>  facets;
-        LineReader              line_reader(data);
-        std::string             solid_name;
-        facet.extra[0] = facet.extra[1] = 0;
-        for (;;) {
-            const char *line = line_reader.next_line();
-            if (line == nullptr)
-                // End of file.
-                break;
-            if (strncmp(line, "solid", 5) == 0) {
-                // Opening the "solid" block.
-                if (! solid_name.empty()) {
-                    // Error, solid block is already open.
-                    facets.clear();
-                    break;
-                }
-                solid_name = line + 5;
-                if (solid_name.empty())
-                    solid_name = "unknown";
-                continue;
-            }
-            if (strncmp(line, "endsolid", 8) == 0) {
-                // Closing the "solid" block.
-                if (solid_name.empty()) {
-                    // Error, no solid block is open.
-                    facets.clear();
-                    break;
-                }
-                solid_name.clear();
-                continue;
-            }
-            // Line has to start with the word solid.
-            int res_normal      = sscanf(line, " facet normal %31s %31s %31s", normal_buf[0], normal_buf[1], normal_buf[2]);
-            assert(res_normal == 3);
-            int res_outer_loop  = line_reader.next_line_scanf(" outer loop");
-            assert(res_outer_loop == 0);
-            int res_vertex1 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[0](0), &facet.vertex[0](1), &facet.vertex[0](2));
-            assert(res_vertex1 == 3);
-            int res_vertex2 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[1](0), &facet.vertex[1](1), &facet.vertex[1](2));
-            assert(res_vertex2 == 3);
-            int res_vertex3 = line_reader.next_line_scanf(" vertex %f %f %f", &facet.vertex[2](0), &facet.vertex[2](1), &facet.vertex[2](2));
-            assert(res_vertex3 == 3);
-            int res_endloop = line_reader.next_line_scanf(" endloop");
-            assert(res_endloop == 0);
-            int res_endfacet = line_reader.next_line_scanf(" endfacet");
-            if (res_normal != 3 || res_outer_loop != 0 || res_vertex1 != 3 || res_vertex2 != 3 || res_vertex3 != 3 || res_endloop != 0 || res_endfacet != 0) {
-                // perror("Something is syntactically very wrong with this ASCII STL!");
-                facets.clear();
-                break;
-            }
-            // The facet normal has been parsed as a single string as to workaround for not a numbers in the normal definition.
-            if (sscanf(normal_buf[0], "%f", &facet.normal(0)) != 1 ||
-                sscanf(normal_buf[1], "%f", &facet.normal(1)) != 1 ||
-                sscanf(normal_buf[2], "%f", &facet.normal(2)) != 1) {
-                // Normal was mangled. Maybe denormals or "not a number" were stored?
-                // Just reset the normal and silently ignore it.
-                facet.normal = stl_normal::Zero();
-            }
-            facets.emplace_back(facet);
-        }
-        if (! facets.empty() && solid_name.empty()) {
-            stl_file &stl = mesh.stl;
-            stl.stats.type = inmemory;
-            stl.stats.number_of_facets = (uint32_t)facets.size();
-            stl.stats.original_num_facets = (int)facets.size();
-            stl_allocate(&stl);
-            memcpy((void*)stl.facet_start.data(), facets.data(), facets.size() * 50);
-            stl_get_size(&stl);
-            mesh.repair();
-            // Add a mesh to a model.
-            if (mesh.facets_count() > 0)
-                mesh_valid = true;
-        }
-    }
-
-    if (! mesh_valid)
-        throw Slic3r::FileIOError(std::string("Archive ") + path + " does not contain a valid mesh for " + name);
-
-    // Add this mesh to the model.
-    ModelVolume *volume = nullptr;
-    if (model_object == nullptr) {
-        // This is a first mesh of a group. Create a new object & volume.
-        model_object = model->add_object(name, path, std::move(mesh));
-        volume = model_object->volumes.front();
-        ModelInstance *instance  = model_object->add_instance();
-        instance->set_rotation(instance_rotation);
-        instance->set_scaling_factor(instance_scaling_factor);
-        instance->set_offset(instance_offset);
-        if (group_id != (unsigned int)(-1))
-            group_to_model_object[group_id] = model_object;
-    } else {
-        // This is not the 1st mesh of a group. Add it to the ModelObject.
-        volume = model_object->add_volume(std::move(mesh));
-        volume->name = name;
-    }
-    // Set the extruder to the volume.
-    if (extruder_id != (unsigned int)-1)
-        volume->config.set("extruder", int(extruder_id));
-}
-
-// Load a PrusaControl project file into a provided model.
-bool load_prus(const char *path, Model *model)
-{
-    mz_zip_archive archive;
-    mz_zip_zero_struct(&archive);
-
-    size_t  n_models_initial = model->objects.size();
-    mz_bool res              = MZ_FALSE;
-    try {
-        if (!open_zip_reader(&archive, path))
-            throw Slic3r::FileIOError(std::string("Unable to init zip reader for ") + path);
-        std::vector<char>           scene_xml_data;
-        // For grouping multiple STLs into a single ModelObject for multi-material prints.
-        std::map<int, ModelObject*> group_to_model_object;
-        mz_uint                     num_entries = mz_zip_reader_get_num_files(&archive);
-        for (mz_uint i = 0; i < num_entries; ++ i) {
-            mz_zip_archive_file_stat stat;
-            if (! mz_zip_reader_file_stat(&archive, i, &stat))
-                continue;
-            std::vector<char> buffer;
-            buffer.assign((size_t)stat.m_uncomp_size, 0);
-            res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (char*)buffer.data(), (size_t)stat.m_uncomp_size, 0);
-            if (res == MZ_FALSE)
-                throw Slic3r::FileIOError(std::string("Error while extracting a file from ") + path);
-            if (strcmp(stat.m_filename, "scene.xml") == 0) {
-                if (! scene_xml_data.empty())
-                    throw Slic3r::FileIOError(std::string("Multiple scene.xml were found in the archive.") + path);
-                scene_xml_data = std::move(buffer);
-            } else if (boost::iends_with(stat.m_filename, ".stl")) {
-                // May throw std::exception
-                extract_model_from_archive(stat.m_filename, path, scene_xml_data, buffer, model, group_to_model_object);
-            }
-        }
-    } catch (std::exception &ex) {
-        close_zip_reader(&archive);
-        throw ex;
-    }
-
-    close_zip_reader(&archive);
-    return model->objects.size() > n_models_initial;
-}
-
-}; // namespace Slic3r
diff --git a/src/libslic3r/Format/PRUS.hpp b/src/libslic3r/Format/PRUS.hpp
deleted file mode 100644
index be5c5c61a..000000000
--- a/src/libslic3r/Format/PRUS.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#define slic3r_Format_PRUS_hpp_
-
-namespace Slic3r {
-
-class TriangleMesh;
-class Model;
-
-// Load a PrusaControl project file into a provided model.
-extern bool load_prus(const char *path, Model *model);
-
-}; // namespace Slic3r
diff --git a/src/libslic3r/Format/SL1.cpp b/src/libslic3r/Format/SL1.cpp
index e2ef801f2..c4b8f030f 100644
--- a/src/libslic3r/Format/SL1.cpp
+++ b/src/libslic3r/Format/SL1.cpp
@@ -203,7 +203,7 @@ RasterParams get_raster_params(const DynamicPrintConfig &cfg)
 
     if (!opt_disp_cols || !opt_disp_rows || !opt_disp_w || !opt_disp_h ||
         !opt_mirror_x || !opt_mirror_y || !opt_orient)
-        throw Slic3r::FileIOError("Invalid SL1 / SL1S file");
+        throw MissingProfileError("Invalid SL1 / SL1S file");
 
     RasterParams rstp;
 
@@ -229,7 +229,7 @@ SliceParams get_slice_params(const DynamicPrintConfig &cfg)
     auto *opt_init_layerh = cfg.option<ConfigOptionFloat>("initial_layer_height");
 
     if (!opt_layerh || !opt_init_layerh)
-        throw Slic3r::FileIOError("Invalid SL1 / SL1S file");
+        throw MissingProfileError("Invalid SL1 / SL1S file");
 
     return SliceParams{opt_layerh->getFloat(), opt_init_layerh->getFloat()};
 }
@@ -293,24 +293,34 @@ ConfigSubstitutions import_sla_archive(const std::string &zipfname, DynamicPrint
     return out.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
 }
 
+// If the profile is missing from the archive (older PS versions did not have
+// it), profile_out's initial value will be used as fallback. profile_out will be empty on
+// function return if the archive did not contain any profile.
 ConfigSubstitutions import_sla_archive(
     const std::string &      zipfname,
     Vec2i                    windowsize,
     indexed_triangle_set &           out,
-    DynamicPrintConfig &     profile,
+    DynamicPrintConfig &     profile_out,
     std::function<bool(int)> progr)
 {
     // Ensure minimum window size for marching squares
     windowsize.x() = std::max(2, windowsize.x());
     windowsize.y() = std::max(2, windowsize.y());
 
-    ArchiveData arch = extract_sla_archive(zipfname, "thumbnail");
-    ConfigSubstitutions config_substitutions = profile.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
+    std::string exclude_entries{"thumbnail"};
+    ArchiveData arch = extract_sla_archive(zipfname, exclude_entries);
+    DynamicPrintConfig profile_in, profile_use;
+    ConfigSubstitutions config_substitutions = profile_in.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
 
-    RasterParams rstp = get_raster_params(profile);
+    // If the archive contains an empty profile, use the one that was passed as output argument
+    // then replace it with the readed profile to report that it was empty.
+    profile_use = profile_in.empty() ? profile_out : profile_in;
+    profile_out = profile_in;
+
+    RasterParams rstp = get_raster_params(profile_use);
     rstp.win          = {windowsize.y(), windowsize.x()};
 
-    SliceParams slicp = get_slice_params(profile);
+    SliceParams slicp = get_slice_params(profile_use);
 
     std::vector<ExPolygons> slices =
         extract_slices_from_sla_archive(arch, rstp, progr);
@@ -413,7 +423,7 @@ void fill_slicerconf(ConfMap &m, const SLAPrint &print)
 
 } // namespace
 
-uqptr<sla::RasterBase> SL1Archive::create_raster() const
+std::unique_ptr<sla::RasterBase> SL1Archive::create_raster() const
 {
     sla::RasterBase::Resolution res;
     sla::RasterBase::PixelDim   pxdim;
diff --git a/src/libslic3r/Format/SL1.hpp b/src/libslic3r/Format/SL1.hpp
index 2c7e1edc1..46a82e1b8 100644
--- a/src/libslic3r/Format/SL1.hpp
+++ b/src/libslic3r/Format/SL1.hpp
@@ -8,11 +8,11 @@
 
 namespace Slic3r {
 
-class SL1Archive: public SLAPrinter {
+class SL1Archive: public SLAArchive {
     SLAPrinterConfig m_cfg;
     
 protected:
-    uqptr<sla::RasterBase> create_raster() const override;
+    std::unique_ptr<sla::RasterBase> create_raster() const override;
     sla::RasterEncoder get_encoder() const override;
 
 public:
@@ -57,6 +57,8 @@ inline ConfigSubstitutions import_sla_archive(
     return import_sla_archive(zipfname, windowsize, out, profile, progr);
 }
 
+class MissingProfileError : public RuntimeError { using RuntimeError::RuntimeError; };
+
 } // namespace Slic3r::sla
 
 #endif // ARCHIVETRAITS_HPP
diff --git a/src/libslic3r/Format/STL.cpp b/src/libslic3r/Format/STL.cpp
index 932906fe0..2f2c9ec7f 100644
--- a/src/libslic3r/Format/STL.cpp
+++ b/src/libslic3r/Format/STL.cpp
@@ -21,8 +21,7 @@ bool load_stl(const char *path, Model *model, const char *object_name_in)
 //    die "Failed to open $file\n" if !-e $path;
         return false;
     }
-    mesh.repair();
-    if (mesh.facets_count() == 0) {
+    if (mesh.empty()) {
         // die "This STL file couldn't be read because it's empty.\n"
         return false;
     }
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index cebc9136f..ff0a7c027 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -784,7 +784,8 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessor::Result* re
     }
 
     BOOST_LOG_TRIVIAL(debug) << "Start processing gcode, " << log_memory_info();
-    m_processor.finalize();
+    // Post-process the G-code to update time stamps.
+    m_processor.finalize(true);
 //    DoExport::update_print_estimated_times_stats(m_processor, print->m_print_statistics);
     DoExport::update_print_estimated_stats(m_processor, m_writer.extruders(), print->m_print_statistics);
     if (result != nullptr) {
@@ -1842,11 +1843,7 @@ namespace ProcessLayer
                 assert(m600_extruder_before_layer >= 0);
 		        // Color Change or Tool Change as Color Change.
                 // add tag for processor
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
                 gcode += ";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Color_Change) + ",T" + std::to_string(m600_extruder_before_layer) + "," + custom_gcode->color + "\n";
-#else
-                gcode += ";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Color_Change) + ",T" + std::to_string(m600_extruder_before_layer) + "\n";
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
                 if (!single_extruder_printer && m600_extruder_before_layer >= 0 && first_extruder_id != (unsigned)m600_extruder_before_layer
                     // && !MMU1
diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index d16cfb9cf..9c90535c4 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -2,6 +2,7 @@
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/format.hpp"
 #include "GCodeProcessor.hpp"
 
 #include <boost/log/trivial.hpp>
@@ -27,9 +28,7 @@ static const float DEFAULT_TOOLPATH_HEIGHT = 0.2f;
 static const float INCHES_TO_MM = 25.4f;
 static const float MMMIN_TO_MMSEC = 1.0f / 60.0f;
 static const float DEFAULT_ACCELERATION = 1500.0f; // Prusa Firmware 1_75mm_MK2
-#if ENABLE_RETRACT_ACCELERATION
 static const float DEFAULT_RETRACT_ACCELERATION = 1500.0f; // Prusa Firmware 1_75mm_MK2
-#endif // ENABLE_RETRACT_ACCELERATION
 static const float DEFAULT_TRAVEL_ACCELERATION = 1250.0f;
 
 static const size_t MIN_EXTRUDERS_COUNT = 5;
@@ -184,10 +183,8 @@ void GCodeProcessor::TimeMachine::reset()
     enabled = false;
     acceleration = 0.0f;
     max_acceleration = 0.0f;
-#if ENABLE_RETRACT_ACCELERATION
     retract_acceleration = 0.0f;
     max_retract_acceleration = 0.0f;
-#endif // ENABLE_RETRACT_ACCELERATION
     travel_acceleration = 0.0f;
     max_travel_acceleration = 0.0f;
     extrude_factor_override_percentage = 1.0f;
@@ -347,18 +344,6 @@ void GCodeProcessor::TimeProcessor::reset()
     machines[static_cast<size_t>(PrintEstimatedStatistics::ETimeMode::Normal)].enabled = true;
 }
 
-struct FilePtr {
-    FilePtr(FILE *f) : f(f) {}
-    ~FilePtr() { this->close(); }
-    void close() { 
-        if (this->f) {
-            ::fclose(this->f);
-            this->f = nullptr;
-        }
-    }
-    FILE* f = nullptr;
-};
-
 void GCodeProcessor::TimeProcessor::post_process(const std::string& filename, std::vector<MoveVertex>& moves, std::vector<size_t>& lines_ends)
 {
     FilePtr in{ boost::nowide::fopen(filename.c_str(), "rb") };
@@ -740,9 +725,7 @@ void GCodeProcessor::Result::reset() {
     extruder_colors = std::vector<std::string>();
     filament_diameters = std::vector<float>(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DIAMETER);
     filament_densities = std::vector<float>(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DENSITY);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     custom_gcode_per_print_z = std::vector<CustomGCode::Item>();
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     time = 0;
 }
 #else
@@ -756,18 +739,19 @@ void GCodeProcessor::Result::reset() {
     extruder_colors = std::vector<std::string>();
     filament_diameters = std::vector<float>(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DIAMETER);
     filament_densities = std::vector<float>(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DENSITY);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     custom_gcode_per_print_z = std::vector<CustomGCode::Item>();
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 }
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
 
 const std::vector<std::pair<GCodeProcessor::EProducer, std::string>> GCodeProcessor::Producers = {
-    { EProducer::PrusaSlicer, "PrusaSlicer" },
-    { EProducer::Slic3rPE,    "Slic3r Prusa Edition" },
-    { EProducer::Slic3r,      "Slic3r" },
+    { EProducer::PrusaSlicer, "generated by PrusaSlicer" },
+    { EProducer::Slic3rPE,    "generated by Slic3r Prusa Edition" },
+    { EProducer::Slic3r,      "generated by Slic3r" },
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+    { EProducer::SuperSlicer, "generated by SuperSlicer" },
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
     { EProducer::Cura,        "Cura_SteamEngine" },
-    { EProducer::Simplify3D,  "Simplify3D" },
+    { EProducer::Simplify3D,  "G-Code generated by Simplify3D(R)" },
     { EProducer::CraftWare,   "CraftWare" },
     { EProducer::ideaMaker,   "ideaMaker" },
     { EProducer::KissSlicer,  "KISSlicer" }
@@ -849,26 +833,16 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
     m_result.extruders_count = extruders_count;
 
     m_extruder_offsets.resize(extruders_count);
-    for (size_t i = 0; i < extruders_count; ++i) {
-        Vec2f offset = config.extruder_offset.get_at(i).cast<float>();
-        m_extruder_offsets[i] = { offset(0), offset(1), 0.0f };
-    }
-
     m_extruder_colors.resize(extruders_count);
-    for (size_t i = 0; i < extruders_count; ++i) {
-        m_extruder_colors[i] = static_cast<unsigned char>(i);
-    }
-
+    m_result.filament_diameters.resize(extruders_count);
+    m_result.filament_densities.resize(extruders_count);
     m_extruder_temps.resize(extruders_count);
 
-    m_result.filament_diameters.resize(config.filament_diameter.values.size());
-    for (size_t i = 0; i < config.filament_diameter.values.size(); ++i) {
-        m_result.filament_diameters[i] = static_cast<float>(config.filament_diameter.values[i]);
-    }
-
-    m_result.filament_densities.resize(config.filament_density.values.size());
-    for (size_t i = 0; i < config.filament_density.values.size(); ++i) {
-        m_result.filament_densities[i] = static_cast<float>(config.filament_density.values[i]);
+    for (size_t i = 0; i < extruders_count; ++ i) {
+        m_extruder_offsets[i]           = to_3d(config.extruder_offset.get_at(i).cast<float>().eval(), 0.f);
+        m_extruder_colors[i]            = static_cast<unsigned char>(i);
+        m_result.filament_diameters[i]  = static_cast<float>(config.filament_diameter.get_at(i));
+        m_result.filament_densities[i]  = static_cast<float>(config.filament_density.get_at(i));
     }
 
     if ((m_flavor == gcfMarlinLegacy || m_flavor == gcfMarlinFirmware) && config.machine_limits_usage.value != MachineLimitsUsage::Ignore) {
@@ -895,11 +869,9 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
         float max_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_extruding, i);
         m_time_processor.machines[i].max_acceleration = max_acceleration;
         m_time_processor.machines[i].acceleration = (max_acceleration > 0.0f) ? max_acceleration : DEFAULT_ACCELERATION;
-#if ENABLE_RETRACT_ACCELERATION
         float max_retract_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_retracting, i);
         m_time_processor.machines[i].max_retract_acceleration = max_retract_acceleration;
         m_time_processor.machines[i].retract_acceleration = (max_retract_acceleration > 0.0f) ? max_retract_acceleration : DEFAULT_RETRACT_ACCELERATION;
-#endif // ENABLE_RETRACT_ACCELERATION
         float max_travel_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_travel, i);
         m_time_processor.machines[i].max_travel_acceleration = max_travel_acceleration;
         m_time_processor.machines[i].travel_acceleration = (max_travel_acceleration > 0.0f) ? max_travel_acceleration : DEFAULT_TRAVEL_ACCELERATION;
@@ -1117,11 +1089,9 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
         float max_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_extruding, i);
         m_time_processor.machines[i].max_acceleration = max_acceleration;
         m_time_processor.machines[i].acceleration = (max_acceleration > 0.0f) ? max_acceleration : DEFAULT_ACCELERATION;
-#if ENABLE_RETRACT_ACCELERATION
         float max_retract_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_retracting, i);
         m_time_processor.machines[i].max_retract_acceleration = max_retract_acceleration;
         m_time_processor.machines[i].retract_acceleration = (max_retract_acceleration > 0.0f) ? max_retract_acceleration : DEFAULT_RETRACT_ACCELERATION;
-#endif // ENABLE_RETRACT_ACCELERATION
         float max_travel_acceleration = get_option_value(m_time_processor.machine_limits.machine_max_acceleration_travel, i);
         m_time_processor.machines[i].max_travel_acceleration = max_travel_acceleration;
         m_time_processor.machines[i].travel_acceleration = (max_travel_acceleration > 0.0f) ? max_travel_acceleration : DEFAULT_TRAVEL_ACCELERATION;
@@ -1200,9 +1170,7 @@ void GCodeProcessor::reset()
     m_result.id = ++s_result_id;
 
     m_use_volumetric_e = false;
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     m_last_default_color_id = 0;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
 #if ENABLE_FIX_PREVIEW_OPTIONS_Z
     m_options_z_corrector.reset();
@@ -1215,6 +1183,18 @@ void GCodeProcessor::reset()
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
 }
 
+static inline const char* skip_whitespaces(const char *begin, const char *end) {
+    for (; begin != end && (*begin == ' ' || *begin == '\t'); ++ begin);
+    return begin;
+}
+
+static inline const char* remove_eols(const char *begin, const char *end) {
+    for (; begin != end && (*(end - 1) == '\r' || *(end - 1) == '\n'); -- end);
+    return end;
+}
+
+// Load a G-code into a stand-alone G-code viewer.
+// throws CanceledException through print->throw_if_canceled() (sent by the caller as callback).
 void GCodeProcessor::process_file(const std::string& filename, std::function<void()> cancel_callback)
 {
     CNumericLocalesSetter locales_setter;
@@ -1226,14 +1206,16 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
     // pre-processing
     // parse the gcode file to detect its producer
     {
-        m_parser.parse_file(filename, [this](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
-            const std::string_view cmd = line.cmd();
-            if (cmd.empty()) {
-                const std::string_view comment = line.comment();
-                if (comment.length() > 1 && detect_producer(comment))
+        m_parser.parse_file_raw(filename, [this](GCodeReader& reader, const char *begin, const char *end) {
+            begin = skip_whitespaces(begin, end);
+            if (begin != end && *begin == ';') {
+                // Comment.
+                begin = skip_whitespaces(++ begin, end);
+                end   = remove_eols(begin, end);
+                if (begin != end && detect_producer(std::string_view(begin, end - begin)))
                     m_parser.quit_parsing();
             }
-            });
+        });
         m_parser.reset();
 
         // if the gcode was produced by PrusaSlicer,
@@ -1249,6 +1231,10 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
         }
         else if (m_producer == EProducer::Simplify3D)
             apply_config_simplify3d(filename);
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+        else if (m_producer == EProducer::SuperSlicer)
+            apply_config_superslicer(filename);
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
     }
 
     // process gcode
@@ -1267,7 +1253,8 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
         this->process_gcode_line(line, true);
     });
 
-    this->finalize();
+    // Don't post-process the G-code to update time stamps.
+    this->finalize(false);
 }
 
 void GCodeProcessor::initialize(const std::string& filename)
@@ -1293,7 +1280,7 @@ void GCodeProcessor::process_buffer(const std::string &buffer)
     });
 }
 
-void GCodeProcessor::finalize()
+void GCodeProcessor::finalize(bool post_process)
 {
     // update width/height of wipe moves
     for (MoveVertex& move : m_result.moves) {
@@ -1323,7 +1310,8 @@ void GCodeProcessor::finalize()
     m_width_compare.output();
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
 
-    m_time_processor.post_process(m_result.filename, m_result.moves, m_result.lines_ends);
+    if (post_process)
+        m_time_processor.post_process(m_result.filename, m_result.moves, m_result.lines_ends);
 #if ENABLE_GCODE_VIEWER_STATISTICS
     m_result.time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - m_start_time).count();
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1380,6 +1368,41 @@ std::vector<std::pair<ExtrusionRole, float>> GCodeProcessor::get_roles_time(Prin
     return ret;
 }
 
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+ConfigSubstitutions load_from_superslicer_gcode_file(const std::string& filename, DynamicPrintConfig& config, ForwardCompatibilitySubstitutionRule compatibility_rule)
+{
+    // for reference, see: ConfigBase::load_from_gcode_file()
+
+    boost::nowide::ifstream ifs(filename);
+
+    auto                      header_end_pos = ifs.tellg();
+    ConfigSubstitutionContext substitutions_ctxt(compatibility_rule);
+    size_t                    key_value_pairs = 0;
+
+    ifs.seekg(0, ifs.end);
+    auto file_length = ifs.tellg();
+    auto data_length = std::min<std::fstream::pos_type>(65535, file_length - header_end_pos);
+    ifs.seekg(file_length - data_length, ifs.beg);
+    std::vector<char> data(size_t(data_length) + 1, 0);
+    ifs.read(data.data(), data_length);
+    ifs.close();
+    key_value_pairs = ConfigBase::load_from_gcode_string_legacy(config, data.data(), substitutions_ctxt);
+
+    if (key_value_pairs < 80)
+        throw Slic3r::RuntimeError(format("Suspiciously low number of configuration values extracted from %1%: %2%", filename, key_value_pairs));
+
+    return std::move(substitutions_ctxt.substitutions);
+}
+
+void GCodeProcessor::apply_config_superslicer(const std::string& filename)
+{
+    DynamicPrintConfig config;
+    config.apply(FullPrintConfig::defaults());
+    load_from_superslicer_gcode_file(filename, config, ForwardCompatibilitySubstitutionRule::EnableSilent);
+    apply_config(config);
+}
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+
 std::vector<float> GCodeProcessor::get_layers_time(PrintEstimatedStatistics::ETimeMode mode) const
 {
     return (mode < PrintEstimatedStatistics::ETimeMode::Count) ?
@@ -1398,9 +1421,11 @@ void GCodeProcessor::apply_config_simplify3d(const std::string& filename)
     };
 
     BedSize bed_size;
+    bool    producer_detected = false;
 
-    m_parser.parse_file(filename, [this, &bed_size](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
-        auto extract_double = [](const std::string& cmt, const std::string& key, double& out) {
+    m_parser.parse_file_raw(filename, [this, &bed_size, &producer_detected](GCodeReader& reader, const char* begin, const char* end) {
+
+        auto extract_double = [](const std::string_view cmt, const std::string& key, double& out) {
             size_t pos = cmt.find(key);
             if (pos != cmt.npos) {
                 pos = cmt.find(',', pos);
@@ -1412,12 +1437,12 @@ void GCodeProcessor::apply_config_simplify3d(const std::string& filename)
             return false;
         };
 
-        auto extract_floats = [](const std::string& cmt, const std::string& key, std::vector<float>& out) {
+        auto extract_floats = [](const std::string_view cmt, const std::string& key, std::vector<float>& out) {
             size_t pos = cmt.find(key);
             if (pos != cmt.npos) {
                 pos = cmt.find(',', pos);
                 if (pos != cmt.npos) {
-                    std::string data_str = cmt.substr(pos + 1);
+                    const std::string_view data_str = cmt.substr(pos + 1);
                     std::vector<std::string> values_str;
                     boost::split(values_str, data_str, boost::is_any_of("|,"), boost::token_compress_on);
                     for (const std::string& s : values_str) {
@@ -1428,28 +1453,40 @@ void GCodeProcessor::apply_config_simplify3d(const std::string& filename)
             }
             return false;
         };
-
-        const std::string& comment = line.raw();
-        if (comment.length() > 2 && comment.front() == ';') {
-            if (bed_size.x == 0.0 && comment.find("strokeXoverride") != comment.npos)
-                extract_double(comment, "strokeXoverride", bed_size.x);
-            else if (bed_size.y == 0.0 && comment.find("strokeYoverride") != comment.npos)
-                extract_double(comment, "strokeYoverride", bed_size.y);
-            else if (comment.find("filamentDiameters") != comment.npos) {
-                m_result.filament_diameters.clear();
-                extract_floats(comment, "filamentDiameters", m_result.filament_diameters);
-            }
-            else if (comment.find("filamentDensities") != comment.npos) {
-                m_result.filament_densities.clear();
-                extract_floats(comment, "filamentDensities", m_result.filament_densities);
-            }
-            else if (comment.find("extruderDiameter") != comment.npos) {
-                std::vector<float> extruder_diameters;
-                extract_floats(comment, "extruderDiameter", extruder_diameters);
-                m_result.extruders_count = extruder_diameters.size();
+        
+        begin = skip_whitespaces(begin, end);
+        end   = remove_eols(begin, end);
+        if (begin != end) {
+            if (*begin == ';') {
+                // Comment.
+                begin = skip_whitespaces(++ begin, end);
+                if (begin != end) {
+                    std::string_view comment(begin, end - begin);
+                    if (producer_detected) {
+                        if (bed_size.x == 0.0 && comment.find("strokeXoverride") != comment.npos)
+                            extract_double(comment, "strokeXoverride", bed_size.x);
+                        else if (bed_size.y == 0.0 && comment.find("strokeYoverride") != comment.npos)
+                            extract_double(comment, "strokeYoverride", bed_size.y);
+                        else if (comment.find("filamentDiameters") != comment.npos) {
+                            m_result.filament_diameters.clear();
+                            extract_floats(comment, "filamentDiameters", m_result.filament_diameters);
+                        } else if (comment.find("filamentDensities") != comment.npos) {
+                            m_result.filament_densities.clear();
+                            extract_floats(comment, "filamentDensities", m_result.filament_densities);
+                        } else if (comment.find("extruderDiameter") != comment.npos) {
+                            std::vector<float> extruder_diameters;
+                            extract_floats(comment, "extruderDiameter", extruder_diameters);
+                            m_result.extruders_count = extruder_diameters.size();
+                        }
+                    } else if (boost::starts_with(comment, "G-Code generated by Simplify3D(R)"))
+                        producer_detected = true;
+                }
+            } else {
+                // Some non-empty G-code line detected, stop parsing config comments.
+                reader.quit_parsing();
             }
         }
-        });
+    });
 
     if (m_result.extruders_count == 0)
         m_result.extruders_count = std::max<size_t>(1, std::min(m_result.filament_diameters.size(), m_result.filament_densities.size()));
@@ -1741,7 +1778,6 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
     // color change tag
     if (boost::starts_with(comment, reserved_tag(ETags::Color_Change))) {
         unsigned char extruder_id = 0;
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         static std::vector<std::string> Default_Colors = {
             "#0B2C7A", // { 0.043f, 0.173f, 0.478f }, // bluish
             "#1C8891", // { 0.110f, 0.533f, 0.569f },
@@ -1790,16 +1826,6 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
             if (m_last_default_color_id == Default_Colors.size())
                 m_last_default_color_id = 0;
         }
-#else
-        if (boost::starts_with(comment.substr(reserved_tag(ETags::Color_Change).size()), ",T")) {
-            int eid;
-            if (!parse_number(comment.substr(reserved_tag(ETags::Color_Change).size() + 2), eid) || eid < 0 || eid > 255) {
-                BOOST_LOG_TRIVIAL(error) << "GCodeProcessor encountered an invalid value for Color_Change (" << comment << ").";
-                return;
-            }
-            extruder_id = static_cast<unsigned char>(eid);
-        }
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
         if (extruder_id < m_extruder_colors.size())
             m_extruder_colors[extruder_id] = static_cast<unsigned char>(m_extruder_offsets.size()) + m_cp_color.counter; // color_change position in list of color for preview
@@ -1810,7 +1836,6 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
         if (m_extruder_id == extruder_id) {
             m_cp_color.current = m_extruder_colors[extruder_id];
             store_move_vertex(EMoveType::Color_change);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             CustomGCode::Item item = { static_cast<double>(m_end_position[2]), CustomGCode::ColorChange, extruder_id + 1, color, "" };
             m_result.custom_gcode_per_print_z.emplace_back(item);
 #if ENABLE_FIX_PREVIEW_OPTIONS_Z
@@ -1818,27 +1843,19 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
 #endif // ENABLE_FIX_PREVIEW_OPTIONS_Z
             process_custom_gcode_time(CustomGCode::ColorChange);
             process_filaments(CustomGCode::ColorChange);
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         }
 
-#if !ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
-        process_custom_gcode_time(CustomGCode::ColorChange);
-        process_filaments(CustomGCode::ColorChange);
-#endif // !ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
-
         return;
     }
 
     // pause print tag
     if (comment == reserved_tag(ETags::Pause_Print)) {
         store_move_vertex(EMoveType::Pause_Print);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         CustomGCode::Item item = { static_cast<double>(m_end_position[2]), CustomGCode::PausePrint, m_extruder_id + 1, "", "" };
         m_result.custom_gcode_per_print_z.emplace_back(item);
 #if ENABLE_FIX_PREVIEW_OPTIONS_Z
         m_options_z_corrector.set();
 #endif // ENABLE_FIX_PREVIEW_OPTIONS_Z
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         process_custom_gcode_time(CustomGCode::PausePrint);
         return;
     }
@@ -1846,13 +1863,11 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
     // custom code tag
     if (comment == reserved_tag(ETags::Custom_Code)) {
         store_move_vertex(EMoveType::Custom_GCode);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         CustomGCode::Item item = { static_cast<double>(m_end_position[2]), CustomGCode::Custom, m_extruder_id + 1, "", "" };
         m_result.custom_gcode_per_print_z.emplace_back(item);
 #if ENABLE_FIX_PREVIEW_OPTIONS_Z
         m_options_z_corrector.set();
 #endif // ENABLE_FIX_PREVIEW_OPTIONS_Z
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         return;
     }
 
@@ -1878,6 +1893,9 @@ bool GCodeProcessor::process_producers_tags(const std::string_view comment)
     {
     case EProducer::Slic3rPE:
     case EProducer::Slic3r: 
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+    case EProducer::SuperSlicer:
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
     case EProducer::PrusaSlicer: { return process_prusaslicer_tags(comment); }
     case EProducer::Cura:        { return process_cura_tags(comment); }
     case EProducer::Simplify3D:  { return process_simplify3d_tags(comment); }
@@ -2707,15 +2725,15 @@ void GCodeProcessor::process_G28(const GCodeReader::GCodeLine& line)
     std::string_view cmd = line.cmd();
     std::string new_line_raw = { cmd.data(), cmd.size() };
     bool found = false;
-    if (line.has_x()) {
+    if (line.has('X')) {
         new_line_raw += " X0";
         found = true;
     }
-    if (line.has_y()) {
+    if (line.has('Y')) {
         new_line_raw += " Y0";
         found = true;
     }
-    if (line.has_z()) {
+    if (line.has('Z')) {
         new_line_raw += " Z0";
         found = true;
     }
@@ -2843,6 +2861,8 @@ void GCodeProcessor::process_M109(const GCodeReader::GCodeLine& line)
         else
             m_extruder_temps[m_extruder_id] = new_temp;
     }
+    else if (line.has_value('S', new_temp))
+        m_extruder_temps[m_extruder_id] = new_temp;
 }
 
 void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line)
@@ -2851,16 +2871,16 @@ void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line)
     // see: https://github.com/makerbot/s3g/blob/master/doc/GCodeProtocol.md
     // Using this command to reset the axis origin to zero helps in fixing: https://github.com/prusa3d/PrusaSlicer/issues/3082
 
-    if (line.has_x())
+    if (line.has('X'))
         m_origin[X] = 0.0f;
 
-    if (line.has_y())
+    if (line.has('Y'))
         m_origin[Y] = 0.0f;
 
-    if (line.has_z())
+    if (line.has('Z'))
         m_origin[Z] = 0.0f;
 
-    if (line.has_e())
+    if (line.has('E'))
         m_origin[E] = 0.0f;
 }
 
@@ -2943,22 +2963,14 @@ void GCodeProcessor::process_M204(const GCodeReader::GCodeLine& line)
                 set_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
                 set_travel_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
                 if (line.has_value('T', value))
-#if ENABLE_RETRACT_ACCELERATION
                     set_retract_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
-#else
-                    set_option_value(m_time_processor.machine_limits.machine_max_acceleration_retracting, i, value);
-#endif // ENABLE_RETRACT_ACCELERATION
             }
             else {
                 // New acceleration format, compatible with the upstream Marlin.
                 if (line.has_value('P', value))
                     set_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
                 if (line.has_value('R', value))
-#if ENABLE_RETRACT_ACCELERATION
                     set_retract_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
-#else
-                    set_option_value(m_time_processor.machine_limits.machine_max_acceleration_retracting, i, value);
-#endif // ENABLE_RETRACT_ACCELERATION
                 if (line.has_value('T', value))
                     // Interpret the T value as the travel acceleration in the new Marlin format.
                     set_travel_acceleration(static_cast<PrintEstimatedStatistics::ETimeMode>(i), value);
@@ -3029,7 +3041,7 @@ void GCodeProcessor::process_M402(const GCodeReader::GCodeLine& line)
     // https://github.com/repetier/Repetier-Firmware/blob/master/src/ArduinoAVR/Repetier/Printer.cpp
     // void Printer::GoToMemoryPosition(bool x, bool y, bool z, bool e, float feed)
 
-    bool has_xyz = !(line.has_x() || line.has_y() || line.has_z());
+    bool has_xyz = !(line.has('X') || line.has('Y') || line.has('Z'));
 
     float p = FLT_MAX;
     for (unsigned char a = X; a <= Z; ++a) {
@@ -3216,20 +3228,12 @@ float GCodeProcessor::get_axis_max_jerk(PrintEstimatedStatistics::ETimeMode mode
     }
 }
 
-#if ENABLE_RETRACT_ACCELERATION
 float GCodeProcessor::get_retract_acceleration(PrintEstimatedStatistics::ETimeMode mode) const
 {
     size_t id = static_cast<size_t>(mode);
     return (id < m_time_processor.machines.size()) ? m_time_processor.machines[id].retract_acceleration : DEFAULT_RETRACT_ACCELERATION;
 }
-#else
-float GCodeProcessor::get_retract_acceleration(PrintEstimatedStatistics::ETimeMode mode) const
-{
-    return get_option_value(m_time_processor.machine_limits.machine_max_acceleration_retracting, static_cast<size_t>(mode));
-}
-#endif // ENABLE_RETRACT_ACCELERATION
 
-#if ENABLE_RETRACT_ACCELERATION
 void GCodeProcessor::set_retract_acceleration(PrintEstimatedStatistics::ETimeMode mode, float value)
 {
     size_t id = static_cast<size_t>(mode);
@@ -3239,7 +3243,6 @@ void GCodeProcessor::set_retract_acceleration(PrintEstimatedStatistics::ETimeMod
             std::min(value, m_time_processor.machines[id].max_retract_acceleration);
     }
 }
-#endif // ENABLE_RETRACT_ACCELERATION
 
 float GCodeProcessor::get_acceleration(PrintEstimatedStatistics::ETimeMode mode) const
 {
diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp
index 040f7432a..fce888233 100644
--- a/src/libslic3r/GCode/GCodeProcessor.hpp
+++ b/src/libslic3r/GCode/GCodeProcessor.hpp
@@ -242,11 +242,9 @@ namespace Slic3r {
             float acceleration; // mm/s^2
             // hard limit for the acceleration, to which the firmware will clamp.
             float max_acceleration; // mm/s^2
-#if ENABLE_RETRACT_ACCELERATION
             float retract_acceleration; // mm/s^2
             // hard limit for the acceleration, to which the firmware will clamp.
             float max_retract_acceleration; // mm/s^2
-#endif // ENABLE_RETRACT_ACCELERATION
             float travel_acceleration; // mm/s^2
             // hard limit for the travel acceleration, to which the firmware will clamp.
             float max_travel_acceleration; // mm/s^2
@@ -359,9 +357,7 @@ namespace Slic3r {
             std::vector<float> filament_diameters;
             std::vector<float> filament_densities;
             PrintEstimatedStatistics print_statistics;
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             std::vector<CustomGCode::Item> custom_gcode_per_print_z;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
 #if ENABLE_GCODE_VIEWER_STATISTICS
             int64_t time{ 0 };
@@ -536,9 +532,7 @@ namespace Slic3r {
 #if ENABLE_FIX_PREVIEW_OPTIONS_Z
         OptionsZCorrector m_options_z_corrector;
 #endif // ENABLE_FIX_PREVIEW_OPTIONS_Z
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         size_t m_last_default_color_id;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 #if ENABLE_GCODE_VIEWER_STATISTICS
         std::chrono::time_point<std::chrono::high_resolution_clock> m_start_time;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -549,6 +543,9 @@ namespace Slic3r {
             PrusaSlicer,
             Slic3rPE,
             Slic3r,
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+            SuperSlicer,
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
             Cura,
             Simplify3D,
             CraftWare,
@@ -585,14 +582,14 @@ namespace Slic3r {
         const Result& get_result() const { return m_result; }
         Result&& extract_result() { return std::move(m_result); }
 
-        // Process the gcode contained in the file with the given filename
+        // Load a G-code into a stand-alone G-code viewer.
         // throws CanceledException through print->throw_if_canceled() (sent by the caller as callback).
         void process_file(const std::string& filename, std::function<void()> cancel_callback = nullptr);
 
         // Streaming interface, for processing G-codes just generated by PrusaSlicer in a pipelined fashion.
         void initialize(const std::string& filename);
         void process_buffer(const std::string& buffer);
-        void finalize();
+        void finalize(bool post_process);
 
         float get_time(PrintEstimatedStatistics::ETimeMode mode) const;
         std::string get_time_dhm(PrintEstimatedStatistics::ETimeMode mode) const;
@@ -605,6 +602,9 @@ namespace Slic3r {
     private:
         void apply_config(const DynamicPrintConfig& config);
         void apply_config_simplify3d(const std::string& filename);
+#if ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
+        void apply_config_superslicer(const std::string& filename);
+#endif // ENABLE_FIX_SUPERSLICER_GCODE_IMPORT
         void process_gcode_line(const GCodeReader::GCodeLine& line, bool producers_enabled);
 
         // Process tags embedded into comments
@@ -724,9 +724,7 @@ namespace Slic3r {
         float get_axis_max_acceleration(PrintEstimatedStatistics::ETimeMode mode, Axis axis) const;
         float get_axis_max_jerk(PrintEstimatedStatistics::ETimeMode mode, Axis axis) const;
         float get_retract_acceleration(PrintEstimatedStatistics::ETimeMode mode) const;
-#if ENABLE_RETRACT_ACCELERATION
         void  set_retract_acceleration(PrintEstimatedStatistics::ETimeMode mode, float value);
-#endif // ENABLE_RETRACT_ACCELERATION
         float get_acceleration(PrintEstimatedStatistics::ETimeMode mode) const;
         void  set_acceleration(PrintEstimatedStatistics::ETimeMode mode, float value);
         float get_travel_acceleration(PrintEstimatedStatistics::ETimeMode mode) const;
diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp
index 61ab10f22..7b106463a 100644
--- a/src/libslic3r/GCodeReader.cpp
+++ b/src/libslic3r/GCodeReader.cpp
@@ -2,9 +2,11 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <boost/nowide/cstdio.hpp>
 #include <fstream>
 #include <iostream>
 #include <iomanip>
+#include "Utils.hpp"
 
 #include "LocalesUtils.hpp"
 
@@ -126,44 +128,92 @@ void GCodeReader::update_coordinates(GCodeLine &gline, std::pair<const char*, co
     }
 }
 
-bool GCodeReader::parse_file(const std::string &file, callback_t callback)
+template<typename ParseLineCallback, typename LineEndCallback>
+bool GCodeReader::parse_file_raw_internal(const std::string &filename, ParseLineCallback parse_line_callback, LineEndCallback line_end_callback)
 {
-    boost::nowide::ifstream f(file);
-    f.sync_with_stdio(false);
+    FilePtr in{ boost::nowide::fopen(filename.c_str(), "rb") };
+
+    // Read the input stream 64kB at a time, extract lines and process them.
     std::vector<char> buffer(65536 * 10, 0);
-    std::string line;
+    // Line buffer.
+    std::string gcode_line;
+    size_t file_pos = 0;
     m_parsing = true;
-    GCodeLine gline;
-    while (m_parsing && ! f.eof()) {
-        f.read(buffer.data(), buffer.size());
-        if (! f.eof() && ! f.good())
-            // Reading the input file failed.
+    for (;;) {
+        size_t cnt_read = ::fread(buffer.data(), 1, buffer.size(), in.f);
+        if (::ferror(in.f))
             return false;
+        bool eof       = cnt_read == 0;
         auto it        = buffer.begin();
-        auto it_bufend = buffer.begin() + f.gcount();
-        while (it != it_bufend) {
-            bool eol = false;
+        auto it_bufend = buffer.begin() + cnt_read;
+        while (it != it_bufend || (eof && ! gcode_line.empty())) {
+            // Find end of line.
+            bool eol    = false;
             auto it_end = it;
-            for (; it_end != it_bufend && ! (eol = *it_end == '\r' || *it_end == '\n'); ++ it_end) ;
-            eol |= f.eof() && it_end == it_bufend;
+            for (; it_end != it_bufend && ! (eol = *it_end == '\r' || *it_end == '\n'); ++ it_end)
+                if (*it_end == '\n')
+                    line_end_callback((it_end - buffer.begin()) + 1);
+            // End of line is indicated also if end of file was reached.
+            eol |= eof && it_end == it_bufend;
             if (eol) {
-                gline.reset();
-                if (line.empty())
-                    this->parse_line(&(*it), &(*it_end), gline, callback);
+                if (gcode_line.empty())
+                    parse_line_callback(&(*it), &(*it_end));
                 else {
-                    line.insert(line.end(), it, it_end);
-                    this->parse_line(line.c_str(), line.c_str() + line.size(), gline, callback);
-                    line.clear();
+                    gcode_line.insert(gcode_line.end(), it, it_end);
+                    parse_line_callback(gcode_line.c_str(), gcode_line.c_str() + gcode_line.size());
+                    gcode_line.clear();
                 }
+                if (! m_parsing)
+                    // The callback wishes to exit.
+                    return true;
             } else
-                line.insert(line.end(), it, it_end);
-            // Skip all the empty lines.
-            for (it = it_end; it != it_bufend && (*it == '\r' || *it == '\n'); ++ it) ;
+                gcode_line.insert(gcode_line.end(), it, it_end);
+            // Skip EOL.
+            it = it_end; 
+            if (it != it_bufend && *it == '\r')
+                ++ it;
+            if (it != it_bufend && *it == '\n') {
+                line_end_callback((it - buffer.begin()) + 1);
+                ++ it;
+            }
         }
+        if (eof)
+            break;
+        file_pos += cnt_read;
     }
     return true;
 }
 
+template<typename ParseLineCallback, typename LineEndCallback>
+bool GCodeReader::parse_file_internal(const std::string &filename, ParseLineCallback parse_line_callback, LineEndCallback line_end_callback)
+{
+    GCodeLine gline;    
+    return this->parse_file_raw_internal(filename, 
+        [this, &gline, parse_line_callback](const char *begin, const char *end) {
+            gline.reset();
+            this->parse_line(begin, end, gline, parse_line_callback);
+        }, 
+        line_end_callback);
+}
+
+bool GCodeReader::parse_file(const std::string &file, callback_t callback)
+{
+    return this->parse_file_internal(file, callback, [](size_t){});
+}
+
+bool GCodeReader::parse_file(const std::string &file, callback_t callback, std::vector<size_t> &lines_ends)
+{
+    lines_ends.clear();
+    return this->parse_file_internal(file, callback, [&lines_ends](size_t file_pos){ lines_ends.emplace_back(file_pos); });
+}
+
+bool GCodeReader::parse_file_raw(const std::string &filename, raw_line_callback_t line_callback)
+{
+    return this->parse_file_raw_internal(filename,
+        [this, line_callback](const char *begin, const char *end) { line_callback(*this, begin, end); }, 
+        [](size_t){});
+}
+
 bool GCodeReader::GCodeLine::has(char axis) const
 {
     const char *c = m_raw.c_str();
diff --git a/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp
index 15376c0fc..0ab268139 100644
--- a/src/libslic3r/GCodeReader.hpp
+++ b/src/libslic3r/GCodeReader.hpp
@@ -76,6 +76,7 @@ public:
     };
 
     typedef std::function<void(GCodeReader&, const GCodeLine&)> callback_t;
+    typedef std::function<void(GCodeReader&, const char*, const char*)> raw_line_callback_t;
     
     GCodeReader() : m_verbose(false), m_extrusion_axis('E') { this->reset(); }
     void reset() { memset(m_position, 0, sizeof(m_position)); }
@@ -114,6 +115,13 @@ public:
 
     // Returns false if reading the file failed.
     bool parse_file(const std::string &file, callback_t callback);
+    // Collect positions of line ends in the binary G-code to be used by the G-code viewer when memory mapping and displaying section of G-code
+    // as an overlay in the 3D scene.
+    bool parse_file(const std::string &file, callback_t callback, std::vector<size_t> &lines_ends);
+    // Just read the G-code file line by line, calls callback (const char *begin, const char *end). Returns false if reading the file failed.
+    bool parse_file_raw(const std::string &file, raw_line_callback_t callback);
+
+    // To be called by the callback to stop parsing.
     void quit_parsing() { m_parsing = false; }
 
     float& x()       { return m_position[X]; }
@@ -132,6 +140,11 @@ public:
 //  void   set_extrusion_axis(char axis) { m_extrusion_axis = axis; }
 
 private:
+    template<typename ParseLineCallback, typename LineEndCallback>
+    bool        parse_file_raw_internal(const std::string &filename, ParseLineCallback parse_line_callback, LineEndCallback line_end_callback);
+    template<typename ParseLineCallback, typename LineEndCallback>
+    bool        parse_file_internal(const std::string &filename, ParseLineCallback parse_line_callback, LineEndCallback line_end_callback);
+
     const char* parse_line_internal(const char *ptr, const char *end, GCodeLine &gline, std::pair<const char*, const char*> &command);
     void        update_coordinates(GCodeLine &gline, std::pair<const char*, const char*> &command);
 
@@ -154,6 +167,7 @@ private:
     char        m_extrusion_axis;
     float       m_position[NUM_AXES];
     bool        m_verbose;
+    // To be set by the callback to stop parsing.
     bool        m_parsing{ false };
 };
 
diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp
index eb45e95c1..f57e25406 100644
--- a/src/libslic3r/GCodeWriter.cpp
+++ b/src/libslic3r/GCodeWriter.cpp
@@ -1,7 +1,6 @@
 #include "GCodeWriter.hpp"
 #include "CustomGCode.hpp"
 #include <algorithm>
-#include <charconv>
 #include <iomanip>
 #include <iostream>
 #include <map>
@@ -11,15 +10,8 @@
     #include <boost/spirit/include/karma.hpp>
 #endif
 
-#define XYZF_EXPORT_DIGITS 3
-#define E_EXPORT_DIGITS 5
-
 #define FLAVOR_IS(val) this->config.gcode_flavor == val
 #define FLAVOR_IS_NOT(val) this->config.gcode_flavor != val
-#define COMMENT(comment) if (this->config.gcode_comments && !comment.empty()) gcode << " ; " << comment;
-#define PRECISION(val, precision) std::fixed << std::setprecision(precision) << (val)
-#define XYZF_NUM(val) PRECISION(val, XYZF_EXPORT_DIGITS)
-#define E_NUM(val) PRECISION(val, E_EXPORT_DIGITS)
 
 namespace Slic3r {
 
@@ -261,115 +253,12 @@ std::string GCodeWriter::toolchange(unsigned int extruder_id)
     return gcode.str();
 }
 
-class G1Writer {
-private:
-    static constexpr const size_t   buflen = 256;
-    char                            buf[buflen];
-    char                           *buf_end;
-    std::to_chars_result            ptr_err;
-
-public:
-    G1Writer() {
-        this->buf[0] = 'G';
-        this->buf[1] = '1';
-        this->buf_end = this->buf + buflen;
-        this->ptr_err.ptr = this->buf + 2;
-    }
-
-    void emit_axis(const char axis, const double v, size_t digits) {
-        assert(digits <= 6);
-        static constexpr const std::array<int, 7> pow_10{1, 10, 100, 1000, 10000, 100000, 1000000};
-        *ptr_err.ptr++ = ' '; *ptr_err.ptr++ = axis;
-
-        char *base_ptr = this->ptr_err.ptr;
-        auto  v_int    = int64_t(std::round(v * pow_10[digits]));
-        // Older stdlib on macOS doesn't support std::from_chars at all, so it is used boost::spirit::karma::generate instead of it.
-        // That is a little bit slower than std::to_chars but not much.
-#ifdef __APPLE__
-        boost::spirit::karma::generate(this->ptr_err.ptr, boost::spirit::karma::int_generator<int64_t>(), v_int);
-#else
-        // this->buf_end minus 1 because we need space for adding the extra decimal point.
-        this->ptr_err = std::to_chars(this->ptr_err.ptr, this->buf_end - 1, v_int);
-#endif
-        size_t writen_digits = (this->ptr_err.ptr - base_ptr) - (v_int < 0 ? 1 : 0);
-        if (writen_digits < digits) {
-            // Number is smaller than 10^digits, so that we will pad it with zeros.
-            size_t remaining_digits = digits - writen_digits;
-            // Move all newly inserted chars by remaining_digits to allocate space for padding with zeros.
-            for (char *from_ptr = this->ptr_err.ptr - 1, *to_ptr = from_ptr + remaining_digits; from_ptr >= this->ptr_err.ptr - writen_digits; --to_ptr, --from_ptr)
-                *to_ptr = *from_ptr;
-
-            memset(this->ptr_err.ptr - writen_digits, '0', remaining_digits);
-            this->ptr_err.ptr += remaining_digits;
-        }
-
-        // Move all newly inserted chars by one to allocate space for a decimal point.
-        for (char *to_ptr = this->ptr_err.ptr, *from_ptr = to_ptr - 1; from_ptr >= this->ptr_err.ptr - digits; --to_ptr, --from_ptr)
-            *to_ptr = *from_ptr;
-
-        *(this->ptr_err.ptr - digits) = '.';
-        for (size_t i = 0; i < digits; ++i) {
-            if (*this->ptr_err.ptr != '0')
-                break;
-            this->ptr_err.ptr--;
-        }
-        if (*this->ptr_err.ptr == '.')
-            this->ptr_err.ptr--;
-        if ((this->ptr_err.ptr + 1) == base_ptr || *this->ptr_err.ptr == '-')
-            *(++this->ptr_err.ptr) = '0';
-        this->ptr_err.ptr++;
-    }
-
-    void emit_xy(const Vec2d &point) {
-        this->emit_axis('X', point.x(), XYZF_EXPORT_DIGITS);
-        this->emit_axis('Y', point.y(), XYZF_EXPORT_DIGITS);
-    }
-
-    void emit_xyz(const Vec3d &point) {
-        this->emit_axis('X', point.x(), XYZF_EXPORT_DIGITS);
-        this->emit_axis('Y', point.y(), XYZF_EXPORT_DIGITS);
-        this->emit_z(point.z());
-    }
-
-    void emit_z(const double z) {
-        this->emit_axis('Z', z, XYZF_EXPORT_DIGITS);
-    }
-
-    void emit_e(const std::string &axis, double v) {
-        if (! axis.empty()) {
-            // not gcfNoExtrusion
-            this->emit_axis(axis[0], v, E_EXPORT_DIGITS);
-        }
-    }
-
-    void emit_f(double speed) {
-        this->emit_axis('F', speed, XYZF_EXPORT_DIGITS);
-    }
-
-    void emit_string(const std::string &s) {
-        strncpy(ptr_err.ptr, s.c_str(), s.size());
-        ptr_err.ptr += s.size();
-    }
-
-    void emit_comment(bool allow_comments, const std::string &comment) {
-        if (allow_comments && ! comment.empty()) {
-            *ptr_err.ptr ++ = ' '; *ptr_err.ptr ++ = ';'; *ptr_err.ptr ++ = ' ';
-            this->emit_string(comment);
-        }
-    }
-
-    std::string string() {
-        *ptr_err.ptr ++ = '\n';
-        return std::string(this->buf, ptr_err.ptr - buf);
-    }
-};
-
 std::string GCodeWriter::set_speed(double F, const std::string &comment, const std::string &cooling_marker) const
 {
     assert(F > 0.);
     assert(F < 100000.);
 
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_f(F);
     w.emit_comment(this->config.gcode_comments, comment);
     w.emit_string(cooling_marker);
@@ -381,7 +270,7 @@ std::string GCodeWriter::travel_to_xy(const Vec2d &point, const std::string &com
     m_pos(0) = point(0);
     m_pos(1) = point(1);
     
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_xy(point);
     w.emit_f(this->config.travel_speed.value * 60.0);
     w.emit_comment(this->config.gcode_comments, comment);
@@ -414,7 +303,7 @@ std::string GCodeWriter::travel_to_xyz(const Vec3d &point, const std::string &co
     m_lifted = 0;
     m_pos = point;
     
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_xyz(point);
     w.emit_f(this->config.travel_speed.value * 60.0);
     w.emit_comment(this->config.gcode_comments, comment);
@@ -448,7 +337,7 @@ std::string GCodeWriter::_travel_to_z(double z, const std::string &comment)
     if (speed == 0.)
         speed = this->config.travel_speed.value;
     
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_z(z);
     w.emit_f(speed * 60.0);
     w.emit_comment(this->config.gcode_comments, comment);
@@ -473,7 +362,7 @@ std::string GCodeWriter::extrude_to_xy(const Vec2d &point, double dE, const std:
     m_pos(1) = point(1);
     m_extruder->extrude(dE);
 
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_xy(point);
     w.emit_e(m_extrusion_axis, m_extruder->E());
     w.emit_comment(this->config.gcode_comments, comment);
@@ -486,7 +375,7 @@ std::string GCodeWriter::extrude_to_xyz(const Vec3d &point, double dE, const std
     m_lifted = 0;
     m_extruder->extrude(dE);
     
-    G1Writer w;
+    GCodeG1Formatter w;
     w.emit_xyz(point);
     w.emit_e(m_extrusion_axis, m_extruder->E());
     w.emit_comment(this->config.gcode_comments, comment);
@@ -517,12 +406,11 @@ std::string GCodeWriter::retract_for_toolchange(bool before_wipe)
 
 std::string GCodeWriter::_retract(double length, double restart_extra, const std::string &comment)
 {
-    std::ostringstream gcode;
-    
     /*  If firmware retraction is enabled, we use a fake value of 1
         since we ignore the actual configured retract_length which 
         might be 0, in which case the retraction logic gets skipped. */
-    if (this->config.use_firmware_retraction) length = 1;
+    if (this->config.use_firmware_retraction)
+        length = 1;
     
     // If we use volumetric E values we turn lengths into volumes */
     if (this->config.use_volumetric_e) {
@@ -532,52 +420,48 @@ std::string GCodeWriter::_retract(double length, double restart_extra, const std
         restart_extra = restart_extra * area;
     }
     
-    double dE = m_extruder->retract(length, restart_extra);
-    if (dE != 0) {
+
+    std::string gcode;
+    if (double dE = m_extruder->retract(length, restart_extra);  dE != 0) {
         if (this->config.use_firmware_retraction) {
-            if (FLAVOR_IS(gcfMachinekit))
-                gcode << "G22 ; retract\n";
-            else
-                gcode << "G10 ; retract\n";
+            gcode = FLAVOR_IS(gcfMachinekit) ? "G22 ; retract\n" : "G10 ; retract\n";
         } else if (! m_extrusion_axis.empty()) {
-            gcode << "G1 " << m_extrusion_axis << E_NUM(m_extruder->E())
-                           << " F" << XYZF_NUM(m_extruder->retract_speed() * 60.);
-            COMMENT(comment);
-            gcode << "\n";
+            GCodeG1Formatter w;
+            w.emit_e(m_extrusion_axis, m_extruder->E());
+            w.emit_f(m_extruder->retract_speed() * 60.);
+            w.emit_comment(this->config.gcode_comments, comment);
+            gcode = w.string();
         }
     }
     
     if (FLAVOR_IS(gcfMakerWare))
-        gcode << "M103 ; extruder off\n";
-    
-    return gcode.str();
+        gcode += "M103 ; extruder off\n";
+
+    return gcode;
 }
 
 std::string GCodeWriter::unretract()
 {
-    std::ostringstream gcode;
+    std::string gcode;
     
     if (FLAVOR_IS(gcfMakerWare))
-        gcode << "M101 ; extruder on\n";
+        gcode = "M101 ; extruder on\n";
     
-    double dE = m_extruder->unretract();
-    if (dE != 0) {
+    if (double dE = m_extruder->unretract(); dE != 0) {
         if (this->config.use_firmware_retraction) {
-            if (FLAVOR_IS(gcfMachinekit))
-                 gcode << "G23 ; unretract\n";
-            else
-                 gcode << "G11 ; unretract\n";
-            gcode << this->reset_e();
+            gcode += FLAVOR_IS(gcfMachinekit) ? "G23 ; unretract\n" : "G11 ; unretract\n";
+            gcode += this->reset_e();
         } else if (! m_extrusion_axis.empty()) {
             // use G1 instead of G0 because G0 will blend the restart with the previous travel move
-            gcode << "G1 " << m_extrusion_axis << E_NUM(m_extruder->E())
-                           << " F" << XYZF_NUM(m_extruder->deretract_speed() * 60.);
-            if (this->config.gcode_comments) gcode << " ; unretract";
-            gcode << "\n";
+            GCodeG1Formatter w;
+            w.emit_e(m_extrusion_axis, m_extruder->E());
+            w.emit_f(m_extruder->deretract_speed() * 60.);
+            w.emit_comment(this->config.gcode_comments, " ; unretract");
+            gcode += w.string();
         }
     }
     
-    return gcode.str();
+    return gcode;
 }
 
 /*  If this method is called more than once before calling unlift(),
@@ -649,4 +533,49 @@ std::string GCodeWriter::set_fan(unsigned int speed) const
     return GCodeWriter::set_fan(this->config.gcode_flavor, this->config.gcode_comments, speed);
 }
 
+
+void GCodeFormatter::emit_axis(const char axis, const double v, size_t digits) {
+    assert(digits <= 6);
+    static constexpr const std::array<int, 7> pow_10{1, 10, 100, 1000, 10000, 100000, 1000000};
+    *ptr_err.ptr++ = ' '; *ptr_err.ptr++ = axis;
+
+    char *base_ptr = this->ptr_err.ptr;
+    auto  v_int    = int64_t(std::round(v * pow_10[digits]));
+    // Older stdlib on macOS doesn't support std::from_chars at all, so it is used boost::spirit::karma::generate instead of it.
+    // That is a little bit slower than std::to_chars but not much.
+#ifdef __APPLE__
+    boost::spirit::karma::generate(this->ptr_err.ptr, boost::spirit::karma::int_generator<int64_t>(), v_int);
+#else
+    // this->buf_end minus 1 because we need space for adding the extra decimal point.
+    this->ptr_err = std::to_chars(this->ptr_err.ptr, this->buf_end - 1, v_int);
+#endif
+    size_t writen_digits = (this->ptr_err.ptr - base_ptr) - (v_int < 0 ? 1 : 0);
+    if (writen_digits < digits) {
+        // Number is smaller than 10^digits, so that we will pad it with zeros.
+        size_t remaining_digits = digits - writen_digits;
+        // Move all newly inserted chars by remaining_digits to allocate space for padding with zeros.
+        for (char *from_ptr = this->ptr_err.ptr - 1, *to_ptr = from_ptr + remaining_digits; from_ptr >= this->ptr_err.ptr - writen_digits; --to_ptr, --from_ptr)
+            *to_ptr = *from_ptr;
+
+        memset(this->ptr_err.ptr - writen_digits, '0', remaining_digits);
+        this->ptr_err.ptr += remaining_digits;
+    }
+
+    // Move all newly inserted chars by one to allocate space for a decimal point.
+    for (char *to_ptr = this->ptr_err.ptr, *from_ptr = to_ptr - 1; from_ptr >= this->ptr_err.ptr - digits; --to_ptr, --from_ptr)
+        *to_ptr = *from_ptr;
+
+    *(this->ptr_err.ptr - digits) = '.';
+    for (size_t i = 0; i < digits; ++i) {
+        if (*this->ptr_err.ptr != '0')
+            break;
+        this->ptr_err.ptr--;
+    }
+    if (*this->ptr_err.ptr == '.')
+        this->ptr_err.ptr--;
+    if ((this->ptr_err.ptr + 1) == base_ptr || *this->ptr_err.ptr == '-')
+        *(++this->ptr_err.ptr) = '0';
+    this->ptr_err.ptr++;
 }
+
+} // namespace Slic3r
diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp
index dd602ca80..6e2c08d3b 100644
--- a/src/libslic3r/GCodeWriter.hpp
+++ b/src/libslic3r/GCodeWriter.hpp
@@ -3,6 +3,7 @@
 
 #include "libslic3r.h"
 #include <string>
+#include <charconv>
 #include "Extruder.hpp"
 #include "Point.hpp"
 #include "PrintConfig.hpp"
@@ -93,6 +94,84 @@ private:
     std::string _retract(double length, double restart_extra, const std::string &comment);
 };
 
+class GCodeFormatter {
+public:
+    GCodeFormatter() {
+        this->buf_end = buf + buflen;
+        this->ptr_err.ptr = this->buf;
+    }
+
+    GCodeFormatter(const GCodeFormatter&) = delete;
+    GCodeFormatter& operator=(const GCodeFormatter&) = delete;
+
+    static constexpr const int XYZF_EXPORT_DIGITS = 3;
+    static constexpr const int E_EXPORT_DIGITS    = 5;
+
+    void emit_axis(const char axis, const double v, size_t digits);
+
+    void emit_xy(const Vec2d &point) {
+        this->emit_axis('X', point.x(), XYZF_EXPORT_DIGITS);
+        this->emit_axis('Y', point.y(), XYZF_EXPORT_DIGITS);
+    }
+
+    void emit_xyz(const Vec3d &point) {
+        this->emit_axis('X', point.x(), XYZF_EXPORT_DIGITS);
+        this->emit_axis('Y', point.y(), XYZF_EXPORT_DIGITS);
+        this->emit_z(point.z());
+    }
+
+    void emit_z(const double z) {
+        this->emit_axis('Z', z, XYZF_EXPORT_DIGITS);
+    }
+
+    void emit_e(const std::string &axis, double v) {
+        if (! axis.empty()) {
+            // not gcfNoExtrusion
+            this->emit_axis(axis[0], v, E_EXPORT_DIGITS);
+        }
+    }
+
+    void emit_f(double speed) {
+        this->emit_axis('F', speed, XYZF_EXPORT_DIGITS);
+    }
+
+    void emit_string(const std::string &s) {
+        strncpy(ptr_err.ptr, s.c_str(), s.size());
+        ptr_err.ptr += s.size();
+    }
+
+    void emit_comment(bool allow_comments, const std::string &comment) {
+        if (allow_comments && ! comment.empty()) {
+            *ptr_err.ptr ++ = ' '; *ptr_err.ptr ++ = ';'; *ptr_err.ptr ++ = ' ';
+            this->emit_string(comment);
+        }
+    }
+
+    std::string string() {
+        *ptr_err.ptr ++ = '\n';
+        return std::string(this->buf, ptr_err.ptr - buf);
+    }
+
+protected:
+    static constexpr const size_t   buflen = 256;
+    char                            buf[buflen];
+    char* buf_end;
+    std::to_chars_result            ptr_err;
+};
+
+class GCodeG1Formatter : public GCodeFormatter {
+public:
+    GCodeG1Formatter() {
+        this->buf[0] = 'G';
+        this->buf[1] = '1';
+        this->buf_end = buf + buflen;
+        this->ptr_err.ptr = this->buf + 2;
+    }
+
+    GCodeG1Formatter(const GCodeG1Formatter&) = delete;
+    GCodeG1Formatter& operator=(const GCodeG1Formatter&) = delete;
+};
+
 } /* namespace Slic3r */
 
 #endif /* slic3r_GCodeWriter_hpp_ */
diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 321443204..420ab473f 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -20,6 +20,12 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/log/trivial.hpp>
 
+#if defined(_MSC_VER) && defined(__clang__)
+#define BOOST_NO_CXX17_HDR_STRING_VIEW
+#endif
+
+#include <boost/multiprecision/integer.hpp>
+
 #ifdef SLIC3R_DEBUG
 #include "SVG.hpp"
 #endif
@@ -1543,4 +1549,205 @@ double rotation_diff_z(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
     return (axis.z() < 0) ? -angle : angle;
 }
 
-} }
+namespace rotcalip {
+
+using int256_t = boost::multiprecision::int256_t;
+using int128_t = boost::multiprecision::int128_t;
+
+template<class Scalar = int64_t>
+inline Scalar magnsq(const Point &p)
+{
+    return Scalar(p.x()) * p.x() + Scalar(p.y()) * p.y();
+}
+
+template<class Scalar = int64_t>
+inline Scalar dot(const Point &a, const Point &b)
+{
+    return Scalar(a.x()) * b.x() + Scalar(a.y()) * b.y();
+}
+
+template<class Scalar = int64_t>
+inline Scalar dotperp(const Point &a, const Point &b)
+{
+    return Scalar(a.x()) * b.y() - Scalar(a.y()) * b.x();
+}
+
+using boost::multiprecision::abs;
+
+// Compares the angle enclosed by vectors dir and dirA (alpha) with the angle
+// enclosed by -dir and dirB (beta). Returns -1 if alpha is less than beta, 0
+// if they are equal and 1 if alpha is greater than beta. Note that dir is
+// reversed for beta, because it represents the opposite side of a caliper.
+int cmp_angles(const Point &dir, const Point &dirA, const Point &dirB) {
+    int128_t dotA = dot(dir, dirA);
+    int128_t dotB = dot(-dir, dirB);
+    int256_t dcosa = int256_t(magnsq(dirB)) * int256_t(abs(dotA)) * dotA;
+    int256_t dcosb = int256_t(magnsq(dirA)) * int256_t(abs(dotB)) * dotB;
+    int256_t diff = dcosa - dcosb;
+
+    return diff > 0? -1 : (diff < 0 ? 1 : 0);
+}
+
+// A helper class to navigate on a polygon. Given a vertex index, one can
+// get the edge belonging to that vertex, the coordinates of the vertex, the
+// next and previous edges. Stuff that is needed in the rotating calipers algo.
+class Idx
+{
+    size_t m_idx;
+    const Polygon *m_poly;
+public:
+    explicit Idx(const Polygon &p): m_idx{0}, m_poly{&p} {}
+    explicit Idx(size_t idx, const Polygon &p): m_idx{idx}, m_poly{&p} {}
+
+    size_t idx() const { return m_idx; }
+    void set_idx(size_t i) { m_idx = i; }
+    size_t next() const { return (m_idx + 1) % m_poly->size(); }
+    size_t inc() { return m_idx = (m_idx + 1) % m_poly->size(); }
+    Point prev_dir() const {
+        return pt() - (*m_poly)[(m_idx + m_poly->size() - 1) % m_poly->size()];
+    }
+
+    const Point &pt() const { return (*m_poly)[m_idx]; }
+    const Point dir() const { return (*m_poly)[next()] - pt(); }
+    const Point  next_dir() const
+    {
+        return (*m_poly)[(m_idx + 2) % m_poly->size()] - (*m_poly)[next()];
+    }
+    const Polygon &poly() const { return *m_poly; }
+};
+
+enum class AntipodalVisitMode { Full, EdgesOnly };
+
+// Visit all antipodal pairs starting from the initial ia, ib pair which
+// has to be a valid antipodal pair (not checked). fn is called for every
+// antipodal pair encountered including the initial one.
+// The callback Fn has a signiture of bool(size_t i, size_t j, const Point &dir)
+// where i,j are the vertex indices of the antipodal pair and dir is the
+// direction of the calipers touching the i vertex.
+template<AntipodalVisitMode mode = AntipodalVisitMode::Full, class Fn>
+void visit_antipodals (Idx& ia, Idx &ib, Fn &&fn)
+{
+    // Set current caliper direction to be the lower edge angle from X axis
+    int cmp = cmp_angles(ia.prev_dir(), ia.dir(), ib.dir());
+    Idx *current = cmp <= 0 ? &ia : &ib, *other = cmp <= 0 ? &ib : &ia;
+    Idx *initial = current;
+    bool visitor_continue = true;
+
+    size_t start = initial->idx();
+    bool finished = false;
+
+    while (visitor_continue && !finished) {
+        Point current_dir_a = current == &ia ? current->dir() : -current->dir();
+        visitor_continue = fn(ia.idx(), ib.idx(), current_dir_a);
+
+        // Parallel edges encountered. An additional pair of antipodals
+        // can be yielded.
+        if constexpr (mode == AntipodalVisitMode::Full)
+            if (cmp == 0 && visitor_continue) {
+                visitor_continue = fn(current == &ia ? ia.idx() : ia.next(),
+                                      current == &ib ? ib.idx() : ib.next(),
+                                      current_dir_a);
+            }
+
+        cmp = cmp_angles(current->dir(), current->next_dir(), other->dir());
+
+        current->inc();
+        if (cmp > 0) {
+            std::swap(current, other);
+        }
+
+        if (initial->idx() == start) finished = true;
+    }
+}
+
+} // namespace rotcalip
+
+bool intersects(const Polygon &A, const Polygon &B)
+{
+    using namespace rotcalip;
+
+    // Establish starting antipodals as extremes in XY plane. Use the
+    // easily obtainable bounding boxes to check if A and B is disjoint
+    // and return false if the are.
+    struct BB
+    {
+        size_t         xmin = 0, xmax = 0, ymin = 0, ymax = 0;
+        const Polygon &P;
+        static bool cmpy(const Point &l, const Point &u)
+        {
+            return l.y() < u.y() || (l.y() == u.y() && l.x() < u.x());
+        }
+
+        BB(const Polygon &poly): P{poly}
+        {
+            for (size_t i = 0; i < P.size(); ++i) {
+                if (P[i] < P[xmin]) xmin = i;
+                if (P[xmax] < P[i]) xmax = i;
+                if (cmpy(P[i], P[ymin])) ymin = i;
+                if (cmpy(P[ymax], P[i])) ymax = i;
+            }
+        }
+    };
+
+    BB bA{A}, bB{B};
+    BoundingBox bbA{{A[bA.xmin].x(), A[bA.ymin].y()}, {A[bA.xmax].x(), A[bA.ymax].y()}};
+    BoundingBox bbB{{B[bB.xmin].x(), B[bB.ymin].y()}, {B[bB.xmax].x(), B[bB.ymax].y()}};
+
+//    if (!bbA.overlap(bbB))
+//        return false;
+
+    // Establish starting antipodals as extreme vertex pairs in X or Y direction
+    // which reside on different polygons. If no such pair is found, the two
+    // polygons are certainly not disjoint.
+    Idx imin{bA.xmin, A}, imax{bB.xmax, B};
+    if (B[bB.xmin] < imin.pt())  imin = Idx{bB.xmin, B};
+    if (imax.pt()  < A[bA.xmax]) imax = Idx{bA.xmax, A};
+    if (&imin.poly() == &imax.poly()) {
+        imin = Idx{bA.ymin, A};
+        imax = Idx{bB.ymax, B};
+        if (B[bB.ymin] < imin.pt())  imin = Idx{bB.ymin, B};
+        if (imax.pt()  < A[bA.ymax]) imax = Idx{bA.ymax, A};
+    }
+
+    if (&imin.poly() == &imax.poly())
+        return true;
+
+    bool found_divisor = false;
+    visit_antipodals<AntipodalVisitMode::EdgesOnly>(
+        imin, imax,
+        [&imin, &imax, &found_divisor](size_t ia, size_t ib, const Point &dir) {
+            //        std::cout << "A" << ia << " B" << ib << " dir " <<
+            //        dir.x() << " " << dir.y() << std::endl;
+            const Polygon &A = imin.poly(), &B = imax.poly();
+
+            Point ref_a = A[(ia + 2) % A.size()], ref_b = B[(ib + 2) % B.size()];
+
+            bool is_left_a = dotperp( dir, ref_a - A[ia]) > 0;
+            bool is_left_b = dotperp(-dir, ref_b - B[ib]) > 0;
+
+            // If both reference points are on the left (or right) of their
+            // respective support lines and the opposite support line is to
+            // the right (or left), the divisor line is found. We only test
+            // the reference point, as by definition, if that is on one side,
+            // all the other points must be on the same side of a support
+            // line. If the support lines are collinear, the polygons must be
+            // on the same side of their respective support lines.
+
+            auto d = dotperp(dir, B[ib] - A[ia]);
+            if (d == 0) {
+                // The caliper lines are collinear, not just parallel
+                found_divisor = (is_left_a && is_left_b) || (!is_left_a && !is_left_b);
+            } else if (d > 0) { // B is to the left of (A, A+1)
+                found_divisor = !is_left_a && !is_left_b;
+            } else { // B is to the right of (A, A+1)
+                found_divisor = is_left_a && is_left_b;
+            }
+
+            return !found_divisor;
+        });
+
+    // Intersects if the divisor was not found
+    return !found_divisor;
+}
+
+}} // namespace Slic3r::Geometry
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index c6af515c8..505ff3d96 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -532,6 +532,10 @@ inline bool is_rotation_ninety_degrees(const Vec3d &rotation)
     return is_rotation_ninety_degrees(rotation.x()) && is_rotation_ninety_degrees(rotation.y()) && is_rotation_ninety_degrees(rotation.z());
 }
 
+// Returns true if the intersection of the two convex polygons A and B
+// is not an empty set.
+bool intersects(const Polygon &A, const Polygon &B);
+
 } } // namespace Slicer::Geometry
 
 #endif
diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
index 64ab700ed..d32107233 100644
--- a/src/libslic3r/LocalesUtils.cpp
+++ b/src/libslic3r/LocalesUtils.cpp
@@ -1,7 +1,13 @@
 #include "LocalesUtils.hpp"
 
+#ifdef _WIN32
+    #include <charconv>
+#endif
 #include <stdexcept>
 
+#include <fast_float/fast_float.h>
+
+
 namespace Slic3r {
 
 
@@ -11,15 +17,15 @@ CNumericLocalesSetter::CNumericLocalesSetter()
     _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
     m_orig_numeric_locale = std::setlocale(LC_NUMERIC, nullptr);
     std::setlocale(LC_NUMERIC, "C");
-#elif __linux__
+#elif __APPLE__
+    m_original_locale = uselocale((locale_t)0);
+    m_new_locale = newlocale(LC_NUMERIC_MASK, "C", m_original_locale);
+    uselocale(m_new_locale);
+#else // linux / BSD
     m_original_locale = uselocale((locale_t)0);
     m_new_locale = duplocale(m_original_locale);
     m_new_locale = newlocale(LC_NUMERIC_MASK, "C", m_new_locale);
     uselocale(m_new_locale);
-#else // APPLE
-    m_original_locale = uselocale((locale_t)0);
-    m_new_locale = newlocale(LC_NUMERIC_MASK, "C", m_original_locale);
-    uselocale(m_new_locale);
 #endif
 }
 
@@ -45,28 +51,37 @@ bool is_decimal_separator_point()
 }
 
 
-double string_to_double_decimal_point(const std::string& str, size_t* pos /* = nullptr*/)
+double string_to_double_decimal_point(const std::string_view str, size_t* pos /* = nullptr*/)
 {
     double out;
-    std::istringstream stream(str);
-    if (! (stream >> out))
-        throw std::invalid_argument("string_to_double_decimal_point conversion failed.");
-    if (pos) {
-        if (stream.eof())
-            *pos = str.size();
-        else
-            *pos = stream.tellg();
-    }
+    size_t p = fast_float::from_chars(str.data(), str.data() + str.size(), out).ptr - str.data();
+    if (pos)
+        *pos = p;
     return out;
 }
 
 std::string float_to_string_decimal_point(double value, int precision/* = -1*/)
 {
+    // Our Windows build server fully supports C++17 std::to_chars. Let's use it.
+    // Other platforms are behind, fall back to slow stringstreams for now.
+#ifdef _WIN32
+    constexpr size_t SIZE = 20;
+    char out[SIZE] = "";
+    std::to_chars_result res;
+    if (precision >=0)
+        res = std::to_chars(out, out+SIZE, value, std::chars_format::fixed, precision);
+    else
+        res = std::to_chars(out, out+SIZE, value, std::chars_format::general, 6);
+    if (res.ec == std::errc::value_too_large)
+        throw std::invalid_argument("float_to_string_decimal_point conversion failed.");
+    return std::string(out, res.ptr - out);
+#else
     std::stringstream buf;
     if (precision >= 0)
         buf << std::fixed << std::setprecision(precision);
     buf << value;
     return buf.str();
+#endif
 }
 
 
diff --git a/src/libslic3r/LocalesUtils.hpp b/src/libslic3r/LocalesUtils.hpp
index 113cfa04b..f63c3572f 100644
--- a/src/libslic3r/LocalesUtils.hpp
+++ b/src/libslic3r/LocalesUtils.hpp
@@ -5,6 +5,7 @@
 #include <clocale>
 #include <iomanip>
 #include <cassert>
+#include <string_view>
 
 #ifdef __APPLE__
 #include <xlocale.h>
@@ -40,7 +41,7 @@ bool is_decimal_separator_point();
 // (We use user C locales and "C" C++ locales in most of the code.)
 std::string float_to_string_decimal_point(double value, int precision = -1);
 //std::string float_to_string_decimal_point(float value,  int precision = -1);
-double string_to_double_decimal_point(const std::string& str, size_t* pos = nullptr);
+double string_to_double_decimal_point(const std::string_view str, size_t* pos = nullptr);
 
 } // namespace Slic3r
 
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index a59165946..25250e234 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -29,18 +29,17 @@ TriangleMesh eigen_to_triangle_mesh(const EigenMesh &emesh)
 {
     auto &VC = emesh.first; auto &FC = emesh.second;
     
-    Pointf3s points(size_t(VC.rows())); 
-    std::vector<Vec3i> facets(size_t(FC.rows()));
+    indexed_triangle_set its;
+    its.vertices.reserve(size_t(VC.rows()));
+    its.indices.reserve(size_t(FC.rows()));
     
     for (Eigen::Index i = 0; i < VC.rows(); ++i)
-        points[size_t(i)] = VC.row(i);
+        its.vertices.emplace_back(VC.row(i).cast<float>());
     
     for (Eigen::Index i = 0; i < FC.rows(); ++i)
-        facets[size_t(i)] = FC.row(i);
+        its.indices.emplace_back(FC.row(i));
     
-    TriangleMesh out{points, facets};
-    out.require_shared_vertices();
-    return out;
+    return TriangleMesh { std::move(its) };
 }
 
 EigenMesh triangle_mesh_to_eigen(const TriangleMesh &mesh)
@@ -131,28 +130,27 @@ void triangle_mesh_to_cgal(const std::vector<stl_vertex> &                 V,
         out.add_face(VI(f(0)), VI(f(1)), VI(f(2)));
 }
 
-inline Vec3d to_vec3d(const _EpicMesh::Point &v)
+inline Vec3f to_vec3f(const _EpicMesh::Point& v)
 {
-    return {v.x(), v.y(), v.z()};
+    return { float(v.x()), float(v.y()), float(v.z()) };
 }
 
-inline Vec3d to_vec3d(const _EpecMesh::Point &v)
+inline Vec3f to_vec3f(const _EpecMesh::Point& v)
 {
     CGAL::Cartesian_converter<EpecKernel, EpicKernel> cvt;
     auto iv = cvt(v);
-    return {iv.x(), iv.y(), iv.z()};
+    return { float(iv.x()), float(iv.y()), float(iv.z()) };
 }
 
 template<class _Mesh> TriangleMesh cgal_to_triangle_mesh(const _Mesh &cgalmesh)
 {
-    Pointf3s points;
-    std::vector<Vec3i> facets;
-    points.reserve(cgalmesh.num_vertices());
-    facets.reserve(cgalmesh.num_faces());
+    indexed_triangle_set its;
+    its.vertices.reserve(cgalmesh.num_vertices());
+    its.indices.reserve(cgalmesh.num_faces());
     
     for (auto &vi : cgalmesh.vertices()) {
         auto &v = cgalmesh.point(vi); // Don't ask...
-        points.emplace_back(to_vec3d(v));
+        its.vertices.emplace_back(to_vec3f(v));
     }
     
     for (auto &face : cgalmesh.faces()) {
@@ -166,12 +164,10 @@ template<class _Mesh> TriangleMesh cgal_to_triangle_mesh(const _Mesh &cgalmesh)
         }
 
         if (i == 3)
-            facets.emplace_back(facet);
+            its.indices.emplace_back(facet);
     }
     
-    TriangleMesh out{points, facets};
-    out.repair();
-    return out;
+    return TriangleMesh(std::move(its));
 }
 
 std::unique_ptr<CGALMesh, CGALMeshDeleter>
diff --git a/src/libslic3r/MeshSplitImpl.hpp b/src/libslic3r/MeshSplitImpl.hpp
index 7233ac40d..c9df648fb 100644
--- a/src/libslic3r/MeshSplitImpl.hpp
+++ b/src/libslic3r/MeshSplitImpl.hpp
@@ -28,65 +28,84 @@ template<> struct ItsWithNeighborsIndex_<indexed_triangle_set> {
     }
 };
 
-// Visit all unvisited neighboring facets that are reachable from the first unvisited facet,
-// and return them.
+// Discover connected patches of facets one by one.
 template<class NeighborIndex>
-std::vector<size_t> its_find_unvisited_neighbors(
-    const indexed_triangle_set &its,
-    const NeighborIndex &       neighbor_index,
-    std::vector<char> &         visited)
-{
-    using stack_el = size_t;
-
-    auto facestack = reserve_vector<stack_el>(its.indices.size());
-    auto push = [&facestack] (const stack_el &s) { facestack.emplace_back(s); };
-    auto pop  = [&facestack] () -> stack_el {
-        stack_el ret = facestack.back();
-        facestack.pop_back();
-        return ret;
-    };
-
-    // find the next unvisited facet and push the index
-    auto facet = std::find(visited.begin(), visited.end(), false);
-    std::vector<size_t> ret;
-
-    if (facet != visited.end()) {
-        ret.reserve(its.indices.size());
-        auto idx = size_t(facet - visited.begin());
-        push(idx);
-        ret.emplace_back(idx);
-        visited[idx] = true;
+struct NeighborVisitor {
+    NeighborVisitor(const indexed_triangle_set &its, const NeighborIndex &neighbor_index) : 
+        its(its), neighbor_index(neighbor_index) {
+        m_visited.assign(its.indices.size(), false);
+        m_facestack.reserve(its.indices.size());
+    }
+    NeighborVisitor(const indexed_triangle_set &its, NeighborIndex &&aneighbor_index) : 
+        its(its), neighbor_index(m_neighbor_index_data), m_neighbor_index_data(std::move(aneighbor_index)) {
+        m_visited.assign(its.indices.size(), false);
+        m_facestack.reserve(its.indices.size());
     }
 
-    while (!facestack.empty()) {
-        size_t facet_idx = pop();
-        const auto &neighbors = neighbor_index[facet_idx];
-        for (auto neighbor_idx : neighbors) {
-            if (size_t(neighbor_idx) < visited.size() && !visited[size_t(neighbor_idx)]) {
-                visited[size_t(neighbor_idx)] = true;
-                push(stack_el(neighbor_idx));
-                ret.emplace_back(size_t(neighbor_idx));
+    template<typename Visitor>
+    void visit(Visitor visitor)
+    {
+        // find the next unvisited facet and push the index
+        auto facet = std::find(m_visited.begin() + m_seed, m_visited.end(), false);
+        m_seed = facet - m_visited.begin();
+
+        if (facet != m_visited.end()) {
+            // Skip this element in the next round.
+            auto idx = m_seed ++;
+            if (! visitor(idx))
+                return;
+            this->push(idx);
+            m_visited[idx] = true;
+            while (! m_facestack.empty()) {
+                size_t facet_idx = this->pop();
+                for (auto neighbor_idx : neighbor_index[facet_idx]) {
+                    assert(neighbor_idx < int(m_visited.size()));
+                    if (neighbor_idx >= 0 && !m_visited[neighbor_idx]) {
+                        if (! visitor(size_t(neighbor_idx)))
+                            return;
+                        m_visited[neighbor_idx] = true;
+                        this->push(stack_el(neighbor_idx));
+                    }
+                }
             }
         }
     }
 
-    return ret;
-}
+    const indexed_triangle_set  &its;
+    const NeighborIndex         &neighbor_index;
+
+private:
+    // If initialized with &&neighbor_index, take the ownership of the data.
+    const NeighborIndex          m_neighbor_index_data;
+
+    std::vector<char>            m_visited;
+
+    using                        stack_el = size_t;
+    std::vector<stack_el>        m_facestack;
+    void                         push(const stack_el &s) { m_facestack.emplace_back(s); }
+    stack_el                     pop() { stack_el ret = m_facestack.back(); m_facestack.pop_back(); return ret; }
+
+    // Last face visited.
+    size_t                       m_seed { 0 };
+};
 
 } // namespace meshsplit_detail
 
+// Funky wrapper for timinig of its_split() using various neighbor index creating methods, see sandboxes/its_neighbor_index/main.cpp
 template<class IndexT> struct ItsNeighborsWrapper
 {
     using Index = IndexT;
-    const indexed_triangle_set *its;
-    IndexT index;
+    const indexed_triangle_set &its;
+    const IndexT               &index_ref;
+    const IndexT                index;
 
-    ItsNeighborsWrapper(const indexed_triangle_set &m, IndexT &&idx)
-        : its{&m}, index{std::move(idx)}
-    {}
+    // Keeping a reference to index, the caller is responsible for keeping the index alive.
+    ItsNeighborsWrapper(const indexed_triangle_set &its, const IndexT &index) : its{its}, index_ref{index} {}
+    // Taking ownership of the index.
+    ItsNeighborsWrapper(const indexed_triangle_set &its, IndexT &&aindex) : its{its}, index_ref{index}, index(std::move(aindex)) {}
 
-    const auto& get_its() const noexcept { return *its; }
-    const auto& get_index() const noexcept { return index; }
+    const auto& get_its() const noexcept { return its; }
+    const auto& get_index() const noexcept { return index_ref; }
 };
 
 // Splits a mesh into multiple meshes when possible.
@@ -97,20 +116,19 @@ void its_split(const Its &m, OutputIt out_it)
 
     const indexed_triangle_set &its = ItsWithNeighborsIndex_<Its>::get_its(m);
 
-    std::vector<char> visited(its.indices.size(), false);
-
     struct VertexConv {
         size_t part_id      = std::numeric_limits<size_t>::max();
         size_t vertex_image;
     };
     std::vector<VertexConv> vidx_conv(its.vertices.size());
 
-    const auto& neighbor_index = ItsWithNeighborsIndex_<Its>::get_index(m);
-
+    meshsplit_detail::NeighborVisitor visitor(its, meshsplit_detail::ItsWithNeighborsIndex_<Its>::get_index(m));
+    
+    std::vector<size_t> facets;
     for (size_t part_id = 0;; ++part_id) {
-        std::vector<size_t> facets =
-            its_find_unvisited_neighbors(its, neighbor_index, visited);
-
+        // Collect all faces of the next patch.
+        facets.clear();
+        visitor.visit([&facets](size_t idx) { facets.emplace_back(idx); return true; });
         if (facets.empty())
             break;
 
@@ -150,17 +168,34 @@ std::vector<indexed_triangle_set> its_split(const Its &its)
     return ret;
 }
 
-template<class Its> bool its_is_splittable(const Its &m)
+template<class Its> 
+bool its_is_splittable(const Its &m)
 {
-    using namespace meshsplit_detail;
-    const indexed_triangle_set &its = ItsWithNeighborsIndex_<Its>::get_its(m);
-    const auto& neighbor_index = ItsWithNeighborsIndex_<Its>::get_index(m);
+    meshsplit_detail::NeighborVisitor visitor(meshsplit_detail::ItsWithNeighborsIndex_<Its>::get_its(m), meshsplit_detail::ItsWithNeighborsIndex_<Its>::get_index(m));
+    bool has_some = false;
+    bool has_some2 = false;
+    // Traverse the 1st patch fully.
+    visitor.visit([&has_some](size_t idx) { has_some = true; return true; });
+    if (has_some)
+        // Just check whether there is any face of the 2nd patch.
+        visitor.visit([&has_some2](size_t idx) { has_some2 = true; return false; });
+    return has_some && has_some2;
+}
 
-    std::vector<char> visited(its.indices.size(), false);
-    its_find_unvisited_neighbors(its, neighbor_index, visited);
-    auto faces = its_find_unvisited_neighbors(its, neighbor_index, visited);
-
-    return !faces.empty();
+template<class Its>
+size_t its_number_of_patches(const Its &m)
+{
+    meshsplit_detail::NeighborVisitor visitor(meshsplit_detail::ItsWithNeighborsIndex_<Its>::get_its(m), meshsplit_detail::ItsWithNeighborsIndex_<Its>::get_index(m));
+    size_t num_patches = 0;
+    for (;;) {
+        bool has_some = false;
+        // Traverse the 1st patch fully.
+        visitor.visit([&has_some](size_t idx) { has_some = true; return true; });
+        if (! has_some)
+            break;
+        ++ num_patches;
+    }
+    return num_patches;
 }
 
 template<class ExPolicy>
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index fb6ab5635..8659e6961 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -9,7 +9,6 @@
 
 #include "Format/AMF.hpp"
 #include "Format/OBJ.hpp"
-#include "Format/PRUS.hpp"
 #include "Format/STL.hpp"
 #include "Format/3mf.hpp"
 
@@ -118,8 +117,6 @@ Model Model::read_from_file(const std::string& input_file, DynamicPrintConfig* c
     else if (boost::algorithm::iends_with(input_file, ".3mf"))
         //FIXME options & LoadAttribute::CheckVersion ? 
         result = load_3mf(input_file.c_str(), *config, *config_substitutions, &model, false);
-    else if (boost::algorithm::iends_with(input_file, ".prusa"))
-        result = load_prus(input_file.c_str(), &model);
     else
         throw Slic3r::RuntimeError("Unknown file format. Input file must have .stl, .obj, .amf(.xml) or .prusa extension.");
 
@@ -478,10 +475,10 @@ bool Model::looks_like_imperial_units() const
 
 void Model::convert_from_imperial_units(bool only_small_volumes)
 {
-    static constexpr const double in_to_mm = 25.4;
+    static constexpr const float in_to_mm = 25.4f;
     for (ModelObject* obj : this->objects)
         if (! only_small_volumes || obj->get_object_stl_stats().volume < volume_threshold_inches) {
-            obj->scale_mesh_after_creation(Vec3d(in_to_mm, in_to_mm, in_to_mm));
+            obj->scale_mesh_after_creation(in_to_mm);
             for (ModelVolume* v : obj->volumes) {
                 assert(! v->source.is_converted_from_meters);
                 v->source.is_converted_from_inches = true;
@@ -508,7 +505,7 @@ void Model::convert_from_meters(bool only_small_volumes)
     static constexpr const double m_to_mm = 1000;
     for (ModelObject* obj : this->objects)
         if (! only_small_volumes || obj->get_object_stl_stats().volume < volume_threshold_meters) {
-            obj->scale_mesh_after_creation(Vec3d(m_to_mm, m_to_mm, m_to_mm));
+            obj->scale_mesh_after_creation(m_to_mm);
             for (ModelVolume* v : obj->volumes) {
                 assert(! v->source.is_converted_from_inches);
                 v->source.is_converted_from_meters = true;
@@ -1065,11 +1062,11 @@ void ModelObject::mirror(Axis axis)
 }
 
 // This method could only be called before the meshes of this ModelVolumes are not shared!
-void ModelObject::scale_mesh_after_creation(const Vec3d &versor)
+void ModelObject::scale_mesh_after_creation(const float scale)
 {
     for (ModelVolume *v : this->volumes) {
-        v->scale_geometry_after_creation(versor);
-        v->set_offset(versor.cwiseProduct(v->get_offset()));
+        v->scale_geometry_after_creation(scale);
+        v->set_offset(Vec3d(scale, scale, scale).cwiseProduct(v->get_offset()));
     }
     this->invalidate_bounding_box();
 }
@@ -1080,9 +1077,8 @@ void ModelObject::convert_units(ModelObjectPtrs& new_objects, ConversionType con
 
     ModelObject* new_object = new_clone(*this);
 
-    double koef = conv_type == ConversionType::CONV_FROM_INCH   ? 25.4 : conv_type == ConversionType::CONV_TO_INCH  ? 0.0393700787  :
-                  conv_type == ConversionType::CONV_FROM_METER  ? 1000 : conv_type == ConversionType::CONV_TO_METER ? 0.001         : 1;
-    const Vec3d versor = Vec3d(koef, koef, koef);
+    float koef = conv_type == ConversionType::CONV_FROM_INCH   ? 25.4f  : conv_type == ConversionType::CONV_TO_INCH  ? 0.0393700787f  :
+                 conv_type == ConversionType::CONV_FROM_METER  ? 1000.f : conv_type == ConversionType::CONV_TO_METER ? 0.001f         : 1.f;
 
     new_object->set_model(nullptr);
     new_object->sla_support_points.clear();
@@ -1095,7 +1091,6 @@ void ModelObject::convert_units(ModelObjectPtrs& new_objects, ConversionType con
     for (ModelVolume* volume : volumes) {
         if (!volume->mesh().empty()) {
             TriangleMesh mesh(volume->mesh());
-            mesh.require_shared_vertices();
 
             ModelVolume* vol = new_object->add_volume(mesh);
             vol->name = volume->name;
@@ -1121,8 +1116,8 @@ void ModelObject::convert_units(ModelObjectPtrs& new_objects, ConversionType con
             if (//vol->source.is_converted_from_inches != from_imperial && 
                 (volume_idxs.empty() || 
                  std::find(volume_idxs.begin(), volume_idxs.end(), vol_idx) != volume_idxs.end())) {
-                vol->scale_geometry_after_creation(versor);
-                vol->set_offset(versor.cwiseProduct(volume->get_offset()));
+                vol->scale_geometry_after_creation(koef);
+                vol->set_offset(Vec3d(koef, koef, koef).cwiseProduct(volume->get_offset()));
                 if (conv_type == ConversionType::CONV_FROM_INCH || conv_type == ConversionType::CONV_TO_INCH)
                     vol->source.is_converted_from_inches = conv_type == ConversionType::CONV_FROM_INCH;
                 if (conv_type == ConversionType::CONV_FROM_METER || conv_type == ConversionType::CONV_TO_METER)
@@ -1154,7 +1149,7 @@ size_t ModelObject::facets_count() const
     size_t num = 0;
     for (const ModelVolume *v : this->volumes)
         if (v->is_model_part())
-            num += v->mesh().stl.stats.number_of_facets;
+            num += v->mesh().facets_count();
     return num;
 }
 
@@ -1167,14 +1162,6 @@ size_t ModelObject::parts_count() const
     return num;
 }
 
-bool ModelObject::needed_repair() const
-{
-    for (const ModelVolume *v : this->volumes)
-        if (v->is_model_part() && v->mesh().needed_repair())
-            return true;
-    return false;
-}
-
 ModelObjectPtrs ModelObject::cut(size_t instance, coordf_t z, ModelObjectCutAttributes attributes)
 {
     if (! attributes.has(ModelObjectCutAttribute::KeepUpper) && ! attributes.has(ModelObjectCutAttribute::KeepLower))
@@ -1256,21 +1243,14 @@ ModelObjectPtrs ModelObject::cut(size_t instance, coordf_t z, ModelObjectCutAttr
             TriangleMesh upper_mesh, lower_mesh;
             {
                 indexed_triangle_set upper_its, lower_its;
-                mesh.require_shared_vertices();
                 cut_mesh(mesh.its, float(z), &upper_its, &lower_its);
-                if (attributes.has(ModelObjectCutAttribute::KeepUpper)) {
+                if (attributes.has(ModelObjectCutAttribute::KeepUpper))
                     upper_mesh = TriangleMesh(upper_its);
-                    upper_mesh.repair();
-                    upper_mesh.reset_repair_stats();
-                }
-                if (attributes.has(ModelObjectCutAttribute::KeepLower)) {
+                if (attributes.has(ModelObjectCutAttribute::KeepLower))
                     lower_mesh = TriangleMesh(lower_its);
-                    lower_mesh.repair();
-                    lower_mesh.reset_repair_stats();
-                }
             }
 
-            if (attributes.has(ModelObjectCutAttribute::KeepUpper) && upper_mesh.facets_count() > 0) {
+            if (attributes.has(ModelObjectCutAttribute::KeepUpper) && ! upper_mesh.empty()) {
                 ModelVolume* vol = upper->add_volume(upper_mesh);
                 vol->name	= volume->name;
                 // Don't copy the config's ID.
@@ -1279,7 +1259,7 @@ ModelObjectPtrs ModelObject::cut(size_t instance, coordf_t z, ModelObjectCutAttr
 	    		assert(vol->config.id() != volume->config.id());
                 vol->set_material(volume->material_id(), *volume->material());
             }
-            if (attributes.has(ModelObjectCutAttribute::KeepLower) && lower_mesh.facets_count() > 0) {
+            if (attributes.has(ModelObjectCutAttribute::KeepLower) && ! lower_mesh.empty()) {
                 ModelVolume* vol = lower->add_volume(lower_mesh);
                 vol->name	= volume->name;
                 // Don't copy the config's ID.
@@ -1349,24 +1329,22 @@ void ModelObject::split(ModelObjectPtrs* new_objects)
         if (volume->type() != ModelVolumeType::MODEL_PART)
             continue;
 
-        TriangleMeshPtrs meshptrs = volume->mesh().split();
+        std::vector<TriangleMesh> meshes = volume->mesh().split();
         size_t counter = 1;
-        for (TriangleMesh* mesh : meshptrs) {
-
+        for (TriangleMesh &mesh : meshes) {
             // FIXME: crashes if not satisfied
-            if (mesh->facets_count() < 3) continue;
-
-            mesh->repair();
+            if (mesh.facets_count() < 3)
+                continue;
 
             // XXX: this seems to be the only real usage of m_model, maybe refactor this so that it's not needed?
             ModelObject* new_object = m_model->add_object();
-            if (meshptrs.size() == 1) {
+            if (meshes.size() == 1) {
                 new_object->name = volume->name;
                 // Don't copy the config's ID.
                 new_object->config.assign_config(this->config.size() > 0 ? this->config : volume->config);
             }
             else {
-                new_object->name = this->name + (meshptrs.size() > 1 ? "_" + std::to_string(counter++) : "");
+                new_object->name = this->name + (meshes.size() > 1 ? "_" + std::to_string(counter++) : "");
                 // Don't copy the config's ID.
                 new_object->config.assign_config(this->config);
             }
@@ -1375,7 +1353,7 @@ void ModelObject::split(ModelObjectPtrs* new_objects)
             new_object->instances.reserve(this->instances.size());
             for (const ModelInstance* model_instance : this->instances)
                 new_object->add_instance(*model_instance);
-            ModelVolume* new_vol = new_object->add_volume(*volume, std::move(*mesh));
+            ModelVolume* new_vol = new_object->add_volume(*volume, std::move(mesh));
 
             for (ModelInstance* model_instance : new_object->instances)
             {
@@ -1387,7 +1365,6 @@ void ModelObject::split(ModelObjectPtrs* new_objects)
             // reset the source to disable reload from disk
             new_vol->source = ModelVolume::Source();
             new_objects->emplace_back(new_object);
-            delete mesh;
         }
     }
 }
@@ -1405,7 +1382,6 @@ void ModelObject::merge()
     for (ModelVolume* volume : volumes)
         if (!volume->mesh().empty())
             mesh.merge(volume->mesh());
-    mesh.repair();
 
     this->clear_volumes();
     ModelVolume* vol = this->add_volume(mesh);
@@ -1508,9 +1484,9 @@ double ModelObject::get_instance_min_z(size_t instance_idx) const
 
         const Transform3d mv = mi * v->get_matrix();
         const TriangleMesh& hull = v->get_convex_hull();
-		for (const stl_facet &facet : hull.stl.facet_start)
+        for (const stl_triangle_vertex_indices& facet : hull.its.indices)
 			for (int i = 0; i < 3; ++ i)
-				min_z = std::min(min_z, (mv * facet.vertex[i].cast<double>()).z());
+				min_z = std::min(min_z, (mv * hull.its.vertices[facet[i]].cast<double>()).z());
     }
 
     return min_z + inst->get_offset(Z);
@@ -1529,9 +1505,9 @@ double ModelObject::get_instance_max_z(size_t instance_idx) const
 
         const Transform3d mv = mi * v->get_matrix();
         const TriangleMesh& hull = v->get_convex_hull();
-        for (const stl_facet& facet : hull.stl.facet_start)
+        for (const stl_triangle_vertex_indices& facet : hull.its.indices)
             for (int i = 0; i < 3; ++i)
-                max_z = std::max(max_z, (mv * facet.vertex[i].cast<double>()).z());
+                max_z = std::max(max_z, (mv * hull.its.vertices[facet[i]].cast<double>()).z());
     }
 
     return max_z + inst->get_offset(Z);
@@ -1572,7 +1548,6 @@ void ModelObject::print_info() const
     boost::nowide::cout << "[" << boost::filesystem::path(this->input_file).filename().string() << "]" << endl;
     
     TriangleMesh mesh = this->raw_mesh();
-    mesh.check_topology();
     BoundingBoxf3 bb = mesh.bounding_box();
     Vec3d size = bb.size();
     cout << "size_x = " << size(0) << endl;
@@ -1584,27 +1559,27 @@ void ModelObject::print_info() const
     cout << "max_x = " << bb.max(0) << endl;
     cout << "max_y = " << bb.max(1) << endl;
     cout << "max_z = " << bb.max(2) << endl;
-    cout << "number_of_facets = " << mesh.stl.stats.number_of_facets  << endl;
-    cout << "manifold = "   << (mesh.is_manifold() ? "yes" : "no") << endl;
+    cout << "number_of_facets = " << mesh.facets_count() << endl;
+
+    cout << "manifold = "   << (mesh.stats().manifold() ? "yes" : "no") << endl;
+    if (! mesh.stats().manifold())
+        cout << "open_edges = " << mesh.stats().open_edges << endl;
     
-    mesh.repair();  // this calculates number_of_parts
-    if (mesh.needed_repair()) {
-        mesh.repair();
-        if (mesh.stl.stats.degenerate_facets > 0)
-            cout << "degenerate_facets = "  << mesh.stl.stats.degenerate_facets << endl;
-        if (mesh.stl.stats.edges_fixed > 0)
-            cout << "edges_fixed = "        << mesh.stl.stats.edges_fixed       << endl;
-        if (mesh.stl.stats.facets_removed > 0)
-            cout << "facets_removed = "     << mesh.stl.stats.facets_removed    << endl;
-        if (mesh.stl.stats.facets_added > 0)
-            cout << "facets_added = "       << mesh.stl.stats.facets_added      << endl;
-        if (mesh.stl.stats.facets_reversed > 0)
-            cout << "facets_reversed = "    << mesh.stl.stats.facets_reversed   << endl;
-        if (mesh.stl.stats.backwards_edges > 0)
-            cout << "backwards_edges = "    << mesh.stl.stats.backwards_edges   << endl;
+    if (mesh.stats().repaired()) {
+        const RepairedMeshErrors& stats = mesh.stats().repaired_errors;
+        if (stats.degenerate_facets > 0)
+            cout << "degenerate_facets = "  << stats.degenerate_facets << endl;
+        if (stats.edges_fixed > 0)
+            cout << "edges_fixed = "        << stats.edges_fixed       << endl;
+        if (stats.facets_removed > 0)
+            cout << "facets_removed = "     << stats.facets_removed    << endl;
+        if (stats.facets_reversed > 0)
+            cout << "facets_reversed = "    << stats.facets_reversed   << endl;
+        if (stats.backwards_edges > 0)
+            cout << "backwards_edges = "    << stats.backwards_edges   << endl;
     }
-    cout << "number_of_parts =  " << mesh.stl.stats.number_of_parts << endl;
-    cout << "volume = "           << mesh.volume()                  << endl;
+    cout << "number_of_parts =  " << mesh.stats().number_of_parts << endl;
+    cout << "volume = "           << mesh.volume()                << endl;
 }
 
 std::string ModelObject::get_export_filename() const
@@ -1627,26 +1602,22 @@ std::string ModelObject::get_export_filename() const
     return ret;
 }
 
-stl_stats ModelObject::get_object_stl_stats() const
+TriangleMeshStats ModelObject::get_object_stl_stats() const
 {
     if (this->volumes.size() == 1)
-        return this->volumes[0]->mesh().stl.stats;
+        return this->volumes[0]->mesh().stats();
 
-    stl_stats full_stats;
+    TriangleMeshStats full_stats;
     full_stats.volume = 0.f;
 
     // fill full_stats from all objet's meshes
     for (ModelVolume* volume : this->volumes)
     {
-        const stl_stats& stats = volume->mesh().stl.stats;
+        const TriangleMeshStats& stats = volume->mesh().stats();
 
         // initialize full_stats (for repaired errors)
-        full_stats.degenerate_facets    += stats.degenerate_facets;
-        full_stats.edges_fixed          += stats.edges_fixed;
-        full_stats.facets_removed       += stats.facets_removed;
-        full_stats.facets_added         += stats.facets_added;
-        full_stats.facets_reversed      += stats.facets_reversed;
-        full_stats.backwards_edges      += stats.backwards_edges;
+        full_stats.open_edges           += stats.open_edges;
+        full_stats.repaired_errors.merge(stats.repaired_errors);
 
         // another used satistics value
         if (volume->is_model_part()) {
@@ -1658,15 +1629,15 @@ stl_stats ModelObject::get_object_stl_stats() const
     return full_stats;
 }
 
-int ModelObject::get_mesh_errors_count(const int vol_idx /*= -1*/) const
+int ModelObject::get_repaired_errors_count(const int vol_idx /*= -1*/) const
 {
     if (vol_idx >= 0)
-        return this->volumes[vol_idx]->get_mesh_errors_count();
+        return this->volumes[vol_idx]->get_repaired_errors_count();
 
-    const stl_stats& stats = get_object_stl_stats();
+    const RepairedMeshErrors& stats = get_object_stl_stats().repaired_errors;
 
     return  stats.degenerate_facets + stats.edges_fixed     + stats.facets_removed +
-            stats.facets_added      + stats.facets_reversed + stats.backwards_edges;
+            stats.facets_reversed + stats.backwards_edges;
 }
 
 void ModelVolume::set_material_id(t_model_material_id material_id)
@@ -1730,14 +1701,15 @@ void ModelVolume::center_geometry_after_creation(bool update_source_offset)
 void ModelVolume::calculate_convex_hull()
 {
     m_convex_hull = std::make_shared<TriangleMesh>(this->mesh().convex_hull_3d());
+    assert(m_convex_hull.get());
 }
 
-int ModelVolume::get_mesh_errors_count() const
+int ModelVolume::get_repaired_errors_count() const
 {
-    const stl_stats& stats = this->mesh().stl.stats;
+    const RepairedMeshErrors &stats = this->mesh().stats().repaired_errors;
 
     return  stats.degenerate_facets + stats.edges_fixed     + stats.facets_removed +
-            stats.facets_added      + stats.facets_reversed + stats.backwards_edges;
+            stats.facets_reversed + stats.backwards_edges;
 }
 
 const TriangleMesh& ModelVolume::get_convex_hull() const
@@ -1785,11 +1757,9 @@ std::string ModelVolume::type_to_string(const ModelVolumeType t)
 // This is useful to assign different materials to different volumes of an object.
 size_t ModelVolume::split(unsigned int max_extruders)
 {
-    TriangleMeshPtrs meshptrs = this->mesh().split();
-    if (meshptrs.size() <= 1) {
-        delete meshptrs.front();
+    std::vector<TriangleMesh> meshes = this->mesh().split();
+    if (meshes.size() <= 1)
         return 1;
-    }
 
     size_t idx = 0;
     size_t ivolume = std::find(this->object->volumes.begin(), this->object->volumes.end(), this) - this->object->volumes.begin();
@@ -1798,15 +1768,14 @@ size_t ModelVolume::split(unsigned int max_extruders)
     unsigned int extruder_counter = 0;
     Vec3d offset = this->get_offset();
 
-    for (TriangleMesh *mesh : meshptrs) {
-        mesh->repair();
-        if (mesh->empty())
+    for (TriangleMesh &mesh : meshes) {
+        if (mesh.empty())
             // Repair may have removed unconnected triangles, thus emptying the mesh.
             continue;
 
         if (idx == 0)
         {
-            this->set_mesh(std::move(*mesh));
+            this->set_mesh(std::move(mesh));
             this->calculate_convex_hull();
             // Assign a new unique ID, so that a new GLVolume will be generated.
             this->set_new_unique_id();
@@ -1814,7 +1783,7 @@ size_t ModelVolume::split(unsigned int max_extruders)
             this->source = ModelVolume::Source();
         }
         else
-            this->object->volumes.insert(this->object->volumes.begin() + (++ivolume), new ModelVolume(object, *this, std::move(*mesh)));
+            this->object->volumes.insert(this->object->volumes.begin() + (++ivolume), new ModelVolume(object, *this, std::move(mesh)));
 
         this->object->volumes[ivolume]->set_offset(Vec3d::Zero());
         this->object->volumes[ivolume]->center_geometry_after_creation();
@@ -1822,7 +1791,6 @@ size_t ModelVolume::split(unsigned int max_extruders)
         this->object->volumes[ivolume]->name = name + "_" + std::to_string(idx + 1);
         this->object->volumes[ivolume]->config.set("extruder", auto_extruder_id(max_extruders, extruder_counter));
         this->object->volumes[ivolume]->m_is_splittable = 0;
-        delete mesh;
         ++ idx;
     }
     
@@ -1891,7 +1859,7 @@ void ModelVolume::mirror(Axis axis)
 }
 
 // This method could only be called before the meshes of this ModelVolumes are not shared!
-void ModelVolume::scale_geometry_after_creation(const Vec3d& versor)
+void ModelVolume::scale_geometry_after_creation(const Vec3f& versor)
 {
 	const_cast<TriangleMesh*>(m_mesh.get())->scale(versor);
 	const_cast<TriangleMesh*>(m_convex_hull.get())->scale(versor);
@@ -1924,8 +1892,7 @@ void ModelVolume::transform_this_mesh(const Matrix3d &matrix, bool fix_left_hand
 void ModelVolume::convert_from_imperial_units()
 {
     assert(! this->source.is_converted_from_meters);
-    double in_to_mm = 25.4;
-    this->scale_geometry_after_creation(Vec3d(in_to_mm, in_to_mm, in_to_mm));
+    this->scale_geometry_after_creation(25.4f);
     this->set_offset(Vec3d(0, 0, 0));
     this->source.is_converted_from_inches = true;
 }
@@ -1933,8 +1900,7 @@ void ModelVolume::convert_from_imperial_units()
 void ModelVolume::convert_from_meters()
 {
     assert(! this->source.is_converted_from_inches);
-    double m_to_mm = 1000;
-    this->scale_geometry_after_creation(Vec3d(m_to_mm, m_to_mm, m_to_mm));
+    this->scale_geometry_after_creation(1000.f);
     this->set_offset(Vec3d(0, 0, 0));
     this->source.is_converted_from_meters = true;
 }
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index 4dd3a534e..efbf84cd4 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -339,13 +339,12 @@ public:
     void mirror(Axis axis);
 
     // This method could only be called before the meshes of this ModelVolumes are not shared!
-    void scale_mesh_after_creation(const Vec3d& versor);
+    void scale_mesh_after_creation(const float scale);
     void convert_units(ModelObjectPtrs&new_objects, ConversionType conv_type, std::vector<int> volume_idxs);
 
     size_t materials_count() const;
     size_t facets_count() const;
     size_t parts_count() const;
-    bool needed_repair() const;
     ModelObjectPtrs cut(size_t instance, coordf_t z, ModelObjectCutAttributes attributes);
     void split(ModelObjectPtrs* new_objects);
     void merge();
@@ -369,9 +368,9 @@ public:
     std::string get_export_filename() const;
 
     // Get full stl statistics for all object's meshes
-    stl_stats   get_object_stl_stats() const;
+    TriangleMeshStats get_object_stl_stats() const;
     // Get count of errors in the mesh( or all object's meshes, if volume index isn't defined)
-    int         get_mesh_errors_count(const int vol_idx = -1) const;
+    int         get_repaired_errors_count(const int vol_idx = -1) const;
 
 private:
     friend class Model;
@@ -613,6 +612,8 @@ public:
     const TriangleMesh& mesh() const { return *m_mesh.get(); }
     void                set_mesh(const TriangleMesh &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); }
     void                set_mesh(TriangleMesh &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); }
+    void                set_mesh(const indexed_triangle_set &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); }
+    void                set_mesh(indexed_triangle_set &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); }
     void                set_mesh(std::shared_ptr<const TriangleMesh> &mesh) { m_mesh = mesh; }
     void                set_mesh(std::unique_ptr<const TriangleMesh> &&mesh) { m_mesh = std::move(mesh); }
 	void				reset_mesh() { m_mesh = std::make_shared<const TriangleMesh>(); }
@@ -667,7 +668,8 @@ public:
     void                mirror(Axis axis);
 
     // This method could only be called before the meshes of this ModelVolumes are not shared!
-    void                scale_geometry_after_creation(const Vec3d& versor);
+    void                scale_geometry_after_creation(const Vec3f &versor);
+    void                scale_geometry_after_creation(const float scale) { this->scale_geometry_after_creation(Vec3f(scale, scale, scale)); }
 
     // Translates the mesh and the convex hull so that the origin of their vertices is in the center of this volume's bounding box.
     // Attention! This method may only be called just after ModelVolume creation! It must not be called once the TriangleMesh of this ModelVolume is shared!
@@ -677,7 +679,7 @@ public:
     const TriangleMesh& get_convex_hull() const;
     std::shared_ptr<const TriangleMesh> get_convex_hull_shared_ptr() const { return m_convex_hull; }
     // Get count of errors in the mesh
-    int                 get_mesh_errors_count() const;
+    int                 get_repaired_errors_count() const;
 
     // Helpers for loading / storing into AMF / 3MF files.
     static ModelVolumeType type_from_string(const std::string &s);
@@ -771,7 +773,7 @@ private:
         assert(this->id() != this->supported_facets.id());
         assert(this->id() != this->seam_facets.id());
         assert(this->id() != this->mmu_segmentation_facets.id());
-        if (mesh.stl.stats.number_of_facets > 1)
+        if (mesh.facets_count() > 1)
             calculate_convex_hull();
     }
     ModelVolume(ModelObject *object, TriangleMesh &&mesh, TriangleMesh &&convex_hull, ModelVolumeType type = ModelVolumeType::MODEL_PART) :
@@ -830,7 +832,7 @@ private:
         assert(this->config.id() == other.config.id());
         this->set_material_id(other.material_id());
         this->config.set_new_unique_id();
-        if (mesh.stl.stats.number_of_facets > 1)
+        if (mesh.facets_count() > 1)
             calculate_convex_hull();
 		assert(this->config.id().valid()); 
         assert(this->config.id() != other.config.id()); 
diff --git a/src/libslic3r/MultiPoint.hpp b/src/libslic3r/MultiPoint.hpp
index 46b47832a..935348279 100644
--- a/src/libslic3r/MultiPoint.hpp
+++ b/src/libslic3r/MultiPoint.hpp
@@ -33,7 +33,9 @@ public:
     void rotate(double angle, const Point &center);
     void reverse() { std::reverse(this->points.begin(), this->points.end()); }
 
-    const Point& first_point() const { return this->points.front(); }
+    const Point& front() const { return this->points.front(); }
+    const Point& back() const { return this->points.back(); }
+    const Point& first_point() const { return this->front(); }
     virtual const Point& last_point() const = 0;
     virtual Lines lines() const = 0;
     size_t size() const { return points.size(); }
diff --git a/src/libslic3r/Platform.cpp b/src/libslic3r/Platform.cpp
index 4aa72c95f..338752112 100644
--- a/src/libslic3r/Platform.cpp
+++ b/src/libslic3r/Platform.cpp
@@ -105,4 +105,42 @@ PlatformFlavor platform_flavor()
 	return s_platform_flavor;
 }
 
+
+
+std::string platform_to_string(Platform platform)
+{
+    switch (platform) {
+        case Platform::Uninitialized: return "Unitialized";
+        case Platform::Unknown      : return "Unknown";
+        case Platform::Windows      : return "Windows";
+        case Platform::OSX          : return "OSX";
+        case Platform::Linux        : return "Linux";
+        case Platform::BSDUnix      : return "BSDUnix";
+    }
+    assert(false);
+    return "";
+}
+
+
+
+std::string platform_flavor_to_string(PlatformFlavor pf)
+{
+    switch (pf) {
+        case PlatformFlavor::Uninitialized   : return "Unitialized";
+        case PlatformFlavor::Unknown         : return "Unknown";
+        case PlatformFlavor::Generic         : return "Generic";
+        case PlatformFlavor::GenericLinux    : return "GenericLinux";
+        case PlatformFlavor::LinuxOnChromium : return "LinuxOnChromium";
+        case PlatformFlavor::WSL             : return "WSL";
+        case PlatformFlavor::WSL2            : return "WSL2";
+        case PlatformFlavor::OpenBSD         : return "OpenBSD";
+        case PlatformFlavor::GenericOSX      : return "GenericOSX";
+        case PlatformFlavor::OSXOnX86        : return "OSXOnX86";
+        case PlatformFlavor::OSXOnArm        : return "OSXOnArm";
+    }
+    assert(false);
+    return "";
+}
+
+
 } // namespace Slic3r
diff --git a/src/libslic3r/Platform.hpp b/src/libslic3r/Platform.hpp
index 1b4d74c02..6db8ba880 100644
--- a/src/libslic3r/Platform.hpp
+++ b/src/libslic3r/Platform.hpp
@@ -1,6 +1,8 @@
 #ifndef SLIC3R_Platform_HPP
 #define SLIC3R_Platform_HPP
 
+#include <string>
+
 namespace Slic3r {
 
 enum class Platform
@@ -16,24 +18,16 @@ enum class Platform
 enum class PlatformFlavor
 {
 	Uninitialized,
-	Unknown,
-	// For Windows and OSX, until we need to be more specific.
-	Generic,
-	// For Platform::Linux
-	GenericLinux,
-	LinuxOnChromium,
-	// Microsoft's Windows on Linux (Linux kernel simulated on NTFS kernel)
-	WSL,
-	// Microsoft's Windows on Linux, version 2 (virtual machine)
-	WSL2,
-	// For Platform::BSDUnix
-	OpenBSD,
-	// For Platform::OSX
-	GenericOSX,
-	// For Apple's on Intel X86 CPU
-	OSXOnX86,
-	// For Apple's on Arm CPU
-	OSXOnArm,
+    Unknown,
+    Generic,         // For Windows and OSX, until we need to be more specific.
+    GenericLinux,    // For Platform::Linux
+    LinuxOnChromium, // For Platform::Linux
+    WSL,             // Microsoft's Windows on Linux (Linux kernel simulated on NTFS kernel)
+    WSL2,            // Microsoft's Windows on Linux, version 2 (virtual machine)
+    OpenBSD,         // For Platform::BSDUnix
+    GenericOSX,      // For Platform::OSX
+    OSXOnX86,        // For Apple's on Intel X86 CPU
+    OSXOnArm,        // For Apple's on Arm CPU
 };
 
 // To be called on program start-up.
@@ -42,6 +36,9 @@ void 			detect_platform();
 Platform 		platform();
 PlatformFlavor 	platform_flavor();
 
+std::string platform_to_string(Platform platform);
+std::string platform_flavor_to_string(PlatformFlavor pf);
+
 } // namespace Slic3r
 
 #endif // SLIC3R_Platform_HPP
diff --git a/src/libslic3r/Point.cpp b/src/libslic3r/Point.cpp
index 7f351d259..b1f3a74bb 100644
--- a/src/libslic3r/Point.cpp
+++ b/src/libslic3r/Point.cpp
@@ -179,6 +179,15 @@ Point Point::projection_onto(const Line &line) const
     return ((line.a - *this).cast<double>().squaredNorm() < (line.b - *this).cast<double>().squaredNorm()) ? line.a : line.b;
 }
 
+bool has_duplicate_points(std::vector<Point> &&pts)
+{
+    std::sort(pts.begin(), pts.end());
+    for (size_t i = 1; i < pts.size(); ++ i)
+        if (pts[i - 1] == pts[i])
+            return true;
+    return false;
+}
+
 BoundingBox get_extents(const Points &pts)
 { 
     return BoundingBox(pts);
diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp
index 20726270d..499ab073d 100644
--- a/src/libslic3r/Point.hpp
+++ b/src/libslic3r/Point.hpp
@@ -211,8 +211,34 @@ inline Point lerp(const Point &a, const Point &b, double t)
     return ((1. - t) * a.cast<double>() + t * b.cast<double>()).cast<coord_t>();
 }
 
-extern BoundingBox get_extents(const Points &pts);
-extern BoundingBox get_extents(const std::vector<Points> &pts);
+BoundingBox get_extents(const Points &pts);
+BoundingBox get_extents(const std::vector<Points> &pts);
+
+// Test for duplicate points in a vector of points.
+// The points are copied, sorted and checked for duplicates globally.
+bool        has_duplicate_points(std::vector<Point> &&pts);
+inline bool has_duplicate_points(const std::vector<Point> &pts)
+{
+    std::vector<Point> cpy = pts;
+    return has_duplicate_points(std::move(cpy));
+}
+
+// Test for duplicate points in a vector of points.
+// Only successive points are checked for equality.
+inline bool has_duplicate_successive_points(const std::vector<Point> &pts)
+{
+    for (size_t i = 1; i < pts.size(); ++ i)
+        if (pts[i - 1] == pts[i])
+            return true;
+    return false;
+}
+
+// Test for duplicate points in a vector of points.
+// Only successive points are checked for equality. Additionally, first and last points are compared for equality.
+inline bool has_duplicate_successive_points_closed(const std::vector<Point> &pts)
+{
+    return has_duplicate_successive_points(pts) || (pts.size() >= 2 && pts.front() == pts.back());
+}
 
 namespace int128 {
     // Exact orientation predicate,
@@ -418,7 +444,7 @@ template<class Tout = double,
          class = FloatingOnly<Tout>>
 inline constexpr Tout unscaled(const Tin &v) noexcept
 {
-    return Tout(v * Tout(SCALING_FACTOR));
+    return Tout(v) * Tout(SCALING_FACTOR);
 }
 
 // Unscaling for Eigen vectors. Input base type can be arithmetic, output base
@@ -432,7 +458,7 @@ template<class Tout = double,
 inline constexpr Eigen::Matrix<Tout, N, EigenArgs...>
 unscaled(const Eigen::Matrix<Tin, N, EigenArgs...> &v) noexcept
 {
-    return v.template cast<Tout>() * SCALING_FACTOR;
+    return v.template cast<Tout>() * Tout(SCALING_FACTOR);
 }
 
 // Align a coordinate to a grid. The coordinate may be negative,
diff --git a/src/libslic3r/Polygon.cpp b/src/libslic3r/Polygon.cpp
index 5b180afca..42a6cc209 100644
--- a/src/libslic3r/Polygon.cpp
+++ b/src/libslic3r/Polygon.cpp
@@ -334,6 +334,27 @@ extern std::vector<BoundingBox> get_extents_vector(const Polygons &polygons)
     return out;
 }
 
+bool has_duplicate_points(const Polygons &polys)
+{
+#if 1
+    // Check globally.
+    size_t cnt = 0;
+    for (const Polygon &poly : polys)
+        cnt += poly.points.size();
+    std::vector<Point> allpts;
+    allpts.reserve(cnt);
+    for (const Polygon &poly : polys)
+        allpts.insert(allpts.end(), poly.points.begin(), poly.points.end());
+    return has_duplicate_points(std::move(allpts));
+#else
+    // Check per contour.
+    for (const Polygon &poly : polys)
+        if (has_duplicate_points(poly))
+            return true;
+    return false;
+#endif
+}
+
 static inline bool is_stick(const Point &p1, const Point &p2, const Point &p3)
 {
     Point v1 = p2 - p1;
diff --git a/src/libslic3r/Polygon.hpp b/src/libslic3r/Polygon.hpp
index c808851c3..913ab3f6e 100644
--- a/src/libslic3r/Polygon.hpp
+++ b/src/libslic3r/Polygon.hpp
@@ -18,11 +18,6 @@ using ConstPolygonPtrs  = std::vector<const Polygon*>;
 class Polygon : public MultiPoint
 {
 public:
-    explicit operator Polygons() const { Polygons pp; pp.push_back(*this); return pp; }
-    explicit operator Polyline() const { return this->split_at_first_point(); }
-    Point& operator[](Points::size_type idx) { return this->points[idx]; }
-    const Point& operator[](Points::size_type idx) const { return this->points[idx]; }
-
     Polygon() = default;
     virtual ~Polygon() = default;
     explicit Polygon(const Points &points) : MultiPoint(points) {}
@@ -39,6 +34,9 @@ public:
     Polygon& operator=(const Polygon &other) { points = other.points; return *this; }
     Polygon& operator=(Polygon &&other) { points = std::move(other.points); return *this; }
 
+    Point& operator[](Points::size_type idx) { return this->points[idx]; }
+    const Point& operator[](Points::size_type idx) const { return this->points[idx]; }
+
     // last point == first point for polygons
     const Point& last_point() const override { return this->points.front(); }
 
@@ -80,11 +78,16 @@ public:
 inline bool operator==(const Polygon &lhs, const Polygon &rhs) { return lhs.points == rhs.points; }
 inline bool operator!=(const Polygon &lhs, const Polygon &rhs) { return lhs.points != rhs.points; }
 
-extern BoundingBox get_extents(const Polygon &poly);
-extern BoundingBox get_extents(const Polygons &polygons);
-extern BoundingBox get_extents_rotated(const Polygon &poly, double angle);
-extern BoundingBox get_extents_rotated(const Polygons &polygons, double angle);
-extern std::vector<BoundingBox> get_extents_vector(const Polygons &polygons);
+BoundingBox get_extents(const Polygon &poly);
+BoundingBox get_extents(const Polygons &polygons);
+BoundingBox get_extents_rotated(const Polygon &poly, double angle);
+BoundingBox get_extents_rotated(const Polygons &polygons, double angle);
+std::vector<BoundingBox> get_extents_vector(const Polygons &polygons);
+
+// Test for duplicate points. The points are copied, sorted and checked for duplicates globally.
+inline bool has_duplicate_points(Polygon &&poly)      { return has_duplicate_points(std::move(poly.points)); }
+inline bool has_duplicate_points(const Polygon &poly) { return has_duplicate_points(poly.points); }
+bool        has_duplicate_points(const Polygons &polys);
 
 inline double total_length(const Polygons &polylines) {
     double total = 0;
@@ -104,19 +107,19 @@ inline double area(const Polygons &polys)
 }
 
 // Remove sticks (tentacles with zero area) from the polygon.
-extern bool        remove_sticks(Polygon &poly);
-extern bool        remove_sticks(Polygons &polys);
+bool remove_sticks(Polygon &poly);
+bool remove_sticks(Polygons &polys);
 
 // Remove polygons with less than 3 edges.
-extern bool        remove_degenerate(Polygons &polys);
-extern bool        remove_small(Polygons &polys, double min_area);
-extern void 	   remove_collinear(Polygon &poly);
-extern void 	   remove_collinear(Polygons &polys);
+bool remove_degenerate(Polygons &polys);
+bool remove_small(Polygons &polys, double min_area);
+void remove_collinear(Polygon &poly);
+void remove_collinear(Polygons &polys);
 
 // Append a vector of polygons at the end of another vector of polygons.
-inline void        polygons_append(Polygons &dst, const Polygons &src) { dst.insert(dst.end(), src.begin(), src.end()); }
+inline void polygons_append(Polygons &dst, const Polygons &src) { dst.insert(dst.end(), src.begin(), src.end()); }
 
-inline void        polygons_append(Polygons &dst, Polygons &&src) 
+inline void polygons_append(Polygons &dst, Polygons &&src) 
 {
     if (dst.empty()) {
         dst = std::move(src);
diff --git a/src/libslic3r/Polyline.cpp b/src/libslic3r/Polyline.cpp
index 68c40fc20..1255d5473 100644
--- a/src/libslic3r/Polyline.cpp
+++ b/src/libslic3r/Polyline.cpp
@@ -10,20 +10,6 @@
 
 namespace Slic3r {
 
-Polyline::operator Polylines() const
-{
-    Polylines polylines;
-    polylines.push_back(*this);
-    return polylines;
-}
-
-Polyline::operator Line() const
-{
-    if (this->points.size() > 2) 
-        throw Slic3r::InvalidArgument("Can't convert polyline with more than two points to a line");
-    return Line(this->points.front(), this->points.back());
-}
-
 const Point& Polyline::leftmost_point() const
 {
     const Point *p = &this->points.front();
diff --git a/src/libslic3r/Polyline.hpp b/src/libslic3r/Polyline.hpp
index 758fc38cd..31e0b88d3 100644
--- a/src/libslic3r/Polyline.hpp
+++ b/src/libslic3r/Polyline.hpp
@@ -59,13 +59,11 @@ public:
             src.points.clear();
         }
     }
-
-    explicit operator Polylines() const;
-    explicit operator Line() const;
+  
     const Point& last_point() const override { return this->points.back(); }
-
     const Point& leftmost_point() const;
     Lines lines() const override;
+
     void clip_end(double distance);
     void clip_start(double distance);
     void extend_end(double distance);
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index f5c8235ed..09cd38468 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1097,14 +1097,6 @@ size_t PresetCollection::update_compatible_internal(const PresetWithVendorProfil
     return m_idx_selected;
 }
 
-// Save the preset under a new name. If the name is different from the old one,
-// a new preset is stored into the list of presets.
-// All presets are marked as not modified and the new preset is activated.
-//void PresetCollection::save_current_preset(const std::string &new_name);
-
-// Delete the current preset, activate the first visible preset.
-//void PresetCollection::delete_current_preset();
-
 // Update a dirty flag of the current preset
 // Return true if the dirty flag changed.
 bool PresetCollection::update_dirty()
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index cb9f04e45..feaf0cac7 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -500,13 +500,15 @@ void PresetBundle::load_selections(AppConfig &config, const PresetPreferences& p
         // Only run this code if just a filament / SLA material was installed by Config Wizard for an active Printer.
         auto printer_technology = printers.get_selected_preset().printer_technology();
         if (printer_technology == ptFFF && ! preferred_selection.filament.empty()) {
-            if (auto it = filaments.find_preset_internal(preferred_selection.filament); it != filaments.end() && it->is_visible) {
-                filaments.select_preset_by_name_strict(preferred_selection.filament);
+            std::string preferred_preset_name = get_preset_name_by_alias(Preset::Type::TYPE_FILAMENT, preferred_selection.filament);
+            if (auto it = filaments.find_preset_internal(preferred_preset_name); it != filaments.end() && it->is_visible) {
+                filaments.select_preset_by_name_strict(preferred_preset_name);
                 this->filament_presets.front() = filaments.get_selected_preset_name();
             }
         } else if (printer_technology == ptSLA && ! preferred_selection.sla_material.empty()) {
-            if (auto it = sla_materials.find_preset_internal(preferred_selection.sla_material); it != sla_materials.end() && it->is_visible)
-                sla_materials.select_preset_by_name_strict(preferred_selection.sla_material);
+            std::string preferred_preset_name = get_preset_name_by_alias(Preset::Type::TYPE_SLA_MATERIAL, preferred_selection.sla_material);
+            if (auto it = sla_materials.find_preset_internal(preferred_preset_name); it != sla_materials.end() && it->is_visible)
+                sla_materials.select_preset_by_name_strict(preferred_preset_name);
         }
     }
 
diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp
index c22599e38..e5e49fb47 100644
--- a/src/libslic3r/PresetBundle.hpp
+++ b/src/libslic3r/PresetBundle.hpp
@@ -143,7 +143,7 @@ public:
 
     const std::string&          get_preset_name_by_alias(const Preset::Type& preset_type, const std::string& alias) const;
 
-    // Save current preset of a required type under a new name. If the name is different from the old one,
+    // Save current preset of a provided type under a new name. If the name is different from the old one,
     // Unselected option would be reverted to the beginning values
     void                        save_changes_for_preset(const std::string& new_name, Preset::Type type, const std::vector<std::string>& unselected_options);
 
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 06052a62f..b33e8bda2 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -397,7 +397,7 @@ bool Print::sequential_print_horizontal_clearance_valid(const Print& print, Poly
 	        convex_hull.translate(instance.shift - print_object->center_offset());
             // if output needed, collect indices (inside convex_hulls_other) of intersecting hulls
             for (size_t i = 0; i < convex_hulls_other.size(); ++i) {
-                if (!intersection((Polygons)convex_hulls_other[i], (Polygons)convex_hull).empty()) {
+                if (! intersection(convex_hulls_other[i], convex_hull).empty()) {
                     if (polygons == nullptr)
                         return false;
                     else {
@@ -434,6 +434,8 @@ static inline bool sequential_print_vertical_clearance_valid(const Print &print)
     return it == print_instances_ordered.end() || (*it)->print_object->height() <= scale_(print.config().extruder_clearance_height.value);
 }
 
+
+
 // Precondition: Print::validate() requires the Print::apply() to be called its invocation.
 std::string Print::validate(std::string* warning) const
 {
@@ -526,42 +528,11 @@ std::string Print::validate(std::string* warning) const
             }
 
             if (has_custom_layering) {
-                const std::vector<coordf_t> &layer_height_profile_tallest = layer_height_profiles[tallest_object_idx];
                 for (size_t idx_object = 0; idx_object < m_objects.size(); ++ idx_object) {
                     if (idx_object == tallest_object_idx)
                         continue;
-                    const std::vector<coordf_t> &layer_height_profile = layer_height_profiles[idx_object];
-
-                    // The comparison of the profiles is not just about element-wise equality, some layers may not be
-                    // explicitely included. Always remember z and height of last reference layer that in the vector
-                    // and compare to that. In case some layers are in the vectors multiple times, only the last entry is
-                    // taken into account and compared.
-                    size_t i = 0; // index into tested profile
-                    size_t j = 0; // index into reference profile
-                    coordf_t ref_z = -1.;
-                    coordf_t next_ref_z = layer_height_profile_tallest[0];
-                    coordf_t ref_height = -1.;
-                    while (i < layer_height_profile.size()) {
-                        coordf_t this_z = layer_height_profile[i];
-                        // find the last entry with this z
-                        while (i+2 < layer_height_profile.size() && layer_height_profile[i+2] == this_z)
-                            i += 2;
-
-                        coordf_t this_height = layer_height_profile[i+1];
-                        if (ref_height < -1. || next_ref_z < this_z + EPSILON) {
-                            ref_z = next_ref_z;
-                            do { // one layer can be in the vector several times
-                                ref_height = layer_height_profile_tallest[j+1];
-                                if (j+2 >= layer_height_profile_tallest.size())
-                                    break;
-                                j += 2;
-                                next_ref_z = layer_height_profile_tallest[j];
-                            } while (ref_z == next_ref_z);
-                        }
-                        if (std::abs(this_height - ref_height) > EPSILON)
-                            return L("The Wipe tower is only supported if all objects have the same variable layer height");
-                        i += 2;
-                    }
+                    if (layer_height_profiles[idx_object] != layer_height_profiles[tallest_object_idx])
+                        return L("The Wipe tower is only supported if all objects have the same variable layer height");
                 }
             }
         }
@@ -812,7 +783,7 @@ void Print::auto_assign_extruders(ModelObject* model_object) const
 // Slicing process, running at a background thread.
 void Print::process()
 {
-    name_tbb_thread_pool_threads();
+    name_tbb_thread_pool_threads_set_locale();
 
     BOOST_LOG_TRIVIAL(info) << "Starting the slicing process." << log_memory_info();
     for (PrintObject *obj : m_objects)
diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp
index 10960c535..0f70cf3cc 100644
--- a/src/libslic3r/PrintApply.cpp
+++ b/src/libslic3r/PrintApply.cpp
@@ -1300,8 +1300,10 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
                     num_extruders,
                     painting_extruders,
                     *print_object_regions,
-                    [&print_object, &update_apply_status](const PrintRegionConfig &old_config, const PrintRegionConfig &new_config, const t_config_option_keys &diff_keys) {
-                        update_apply_status(print_object.invalidate_state_by_config_options(old_config, new_config, diff_keys));
+                    [it_print_object, it_print_object_end, &update_apply_status](const PrintRegionConfig &old_config, const PrintRegionConfig &new_config, const t_config_option_keys &diff_keys) {
+                        for (auto it = it_print_object; it != it_print_object_end; ++it)
+                            if ((*it)->m_shared_regions != nullptr)
+                                update_apply_status((*it)->invalidate_state_by_config_options(old_config, new_config, diff_keys));
                     })) {
                 // Regions are valid, just keep them.
             } else {
diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
index c4b6b7cce..7de74035b 100644
--- a/src/libslic3r/PrintBase.cpp
+++ b/src/libslic3r/PrintBase.cpp
@@ -60,6 +60,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
     DynamicConfig cfg;
     if (config_override != nullptr)
     	cfg = *config_override;
+    cfg.set_key_value("version", new ConfigOptionString(std::string(SLIC3R_VERSION)));
     PlaceholderParser::update_timestamp(cfg);
     this->update_object_placeholders(cfg, default_ext);
     if (! filename_base.empty()) {
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index d9a4f2670..f49eddf3e 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -397,22 +397,6 @@ void PrintObject::generate_support_material()
                 if (layer->empty())
                     throw Slic3r::SlicingError("Levitating objects cannot be printed without supports.");
 #endif
-
-            // Do we have custom support data that would not be used?
-            // Notify the user in that case.
-            if (! this->has_support()) {
-                for (const ModelVolume* mv : this->model_object()->volumes) {
-                    bool has_enforcers = mv->is_support_enforcer() || 
-                        (mv->is_model_part() && mv->supported_facets.has_facets(*mv, EnforcerBlockerType::ENFORCER));
-                    if (has_enforcers) {
-                        this->active_step_add_warning(PrintStateBase::WarningLevel::CRITICAL,
-                            L("An object has custom support enforcers which will not be used "
-                              "because supports are off. Consider turning them on.") + "\n" +
-                            (L("Object name")) + ": " + this->model_object()->name);
-                        break;
-                    }
-                }
-            }
         }
         this->set_done(posSupportMaterial);
     }
@@ -1447,7 +1431,7 @@ void PrintObject::bridge_over_infill()
                 Polygons to_bridge_pp = internal_solid;
                 
                 // iterate through lower layers spanned by bridge_flow
-                double bottom_z = layer->print_z - bridge_flow.height();
+                double bottom_z = layer->print_z - bridge_flow.height() - EPSILON;
                 for (int i = int(layer_it - m_layers.begin()) - 1; i >= 0; --i) {
                     const Layer* lower_layer = m_layers[i];
                     
diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp
index 1d61be85b..7db0de626 100644
--- a/src/libslic3r/PrintObjectSlice.cpp
+++ b/src/libslic3r/PrintObjectSlice.cpp
@@ -39,23 +39,6 @@ LayerPtrs new_layers(
     return out;
 }
 
-//FIXME The admesh repair function may break the face connectivity, rather refresh it here as the slicing code relies on it.
-// This function will go away once we get rid of admesh from ModelVolume.
-static indexed_triangle_set get_mesh_its_fix_mesh_connectivity(TriangleMesh mesh)
-{
-    assert(mesh.repaired && mesh.has_shared_vertices());
-    if (mesh.stl.stats.number_of_facets > 0) {
-        assert(mesh.repaired && mesh.has_shared_vertices());
-        auto nr_degenerated = mesh.stl.stats.degenerate_facets;
-        stl_check_facets_exact(&mesh.stl);
-        if (nr_degenerated != mesh.stl.stats.degenerate_facets)
-            // stl_check_facets_exact() removed some newly degenerated faces. Some faces could become degenerate after some mesh transformation.
-            stl_generate_shared_vertices(&mesh.stl, mesh.its);
-    } else
-        mesh.its.clear();
-    return std::move(mesh.its);
-}
-
 // Slice single triangle mesh.
 static std::vector<ExPolygons> slice_volume(
     const ModelVolume             &volume,
@@ -65,7 +48,7 @@ static std::vector<ExPolygons> slice_volume(
 {
     std::vector<ExPolygons> layers;
     if (! zs.empty()) {
-        indexed_triangle_set its = get_mesh_its_fix_mesh_connectivity(volume.mesh());
+        indexed_triangle_set its = volume.mesh().its;
         if (its.indices.size() > 0) {
             MeshSlicingParamsEx params2 { params };
             params2.trafo = params2.trafo * volume.get_matrix();
diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp
index 55dae9430..9cac7f63b 100644
--- a/src/libslic3r/SLA/Hollowing.cpp
+++ b/src/libslic3r/SLA/Hollowing.cpp
@@ -286,8 +286,6 @@ void cut_drainholes(std::vector<ExPolygons> & obj_slices,
     
     if (mesh.empty()) return;
     
-    mesh.require_shared_vertices();
- 
     std::vector<ExPolygons> hole_slices = slice_mesh_ex(mesh.its, slicegrid, closing_radius, thr);
     
     if (obj_slices.size() != hole_slices.size())
@@ -316,7 +314,6 @@ void hollow_mesh(TriangleMesh &mesh, const Interior &interior, int flags)
         remove_inside_triangles(mesh, interior);
 
     mesh.merge(TriangleMesh{interior.mesh});
-    mesh.require_shared_vertices();
 }
 
 // Get the distance of p to the interior's zero iso_surface. Interior should
@@ -557,8 +554,7 @@ void remove_inside_triangles(TriangleMesh &mesh, const Interior &interior,
     new_faces = {};
 
     mesh = TriangleMesh{mesh.its};
-    mesh.repaired = true;
-    mesh.require_shared_vertices();
+    //FIXME do we want to repair the mesh? Are there duplicate vertices or flipped triangles?
 }
 
 }} // namespace Slic3r::sla
diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp
index 8d995b59e..1e5de5158 100644
--- a/src/libslic3r/SLA/Pad.cpp
+++ b/src/libslic3r/SLA/Pad.cpp
@@ -370,7 +370,7 @@ bool add_cavity(indexed_triangle_set &pad,
 
     if (inner_base.empty() || middle_base.empty()) { logerr(); return false; }
 
-    ExPolygons pdiff = diff_ex((Polygons)top_poly, (Polygons)middle_base.contour);
+    ExPolygons pdiff = diff_ex(top_poly, middle_base.contour);
 
     if (pdiff.size() != 1) { logerr(); return false; }
 
diff --git a/src/libslic3r/SLA/RasterBase.hpp b/src/libslic3r/SLA/RasterBase.hpp
index 1cd688ccb..1eba360e3 100644
--- a/src/libslic3r/SLA/RasterBase.hpp
+++ b/src/libslic3r/SLA/RasterBase.hpp
@@ -13,10 +13,6 @@
 
 namespace Slic3r {
 
-template<class T> using uqptr = std::unique_ptr<T>;
-template<class T> using shptr = std::shared_ptr<T>;
-template<class T> using wkptr = std::weak_ptr<T>;
-
 namespace sla {
 
 // Raw byte buffer paired with its size. Suitable for compressed image data.
@@ -112,7 +108,7 @@ struct PPMRasterEncoder {
 std::ostream& operator<<(std::ostream &stream, const EncodedRaster &bytes);
 
 // If gamma is zero, thresholding will be performed which disables AA.
-uqptr<RasterBase> create_raster_grayscale_aa(
+std::unique_ptr<RasterBase> create_raster_grayscale_aa(
     const RasterBase::Resolution &res,
     const RasterBase::PixelDim &  pxdim,
     double                        gamma = 1.0,
diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
index 20804193e..3ad7d62b1 100644
--- a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
+++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
@@ -33,7 +33,6 @@ inline void reproject_points_and_holes(ModelObject *object)
     if (!object || (!has_holes && !has_sppoints)) return;
 
     TriangleMesh rmsh = object->raw_mesh();
-    rmsh.require_shared_vertices();
     IndexedMesh emesh{rmsh};
 
     if (has_sppoints)
diff --git a/src/libslic3r/SLA/Rotfinder.cpp b/src/libslic3r/SLA/Rotfinder.cpp
index 5486741f2..196646dc9 100644
--- a/src/libslic3r/SLA/Rotfinder.cpp
+++ b/src/libslic3r/SLA/Rotfinder.cpp
@@ -205,7 +205,6 @@ inline bool is_on_floor(const SLAPrintObjectConfig &cfg)
 std::vector<XYRotation> get_chull_rotations(const TriangleMesh &mesh, size_t max_count)
 {
     TriangleMesh chull = mesh.convex_hull_3d();
-    chull.require_shared_vertices();
     double chull2d_area = chull.convex_hull().area();
     double area_threshold = chull2d_area / (scaled<double>(1e3) * scaled(1.));
 
@@ -299,7 +298,6 @@ struct RotfinderBoilerplate {
     static TriangleMesh get_mesh_to_rotate(const ModelObject &mo)
     {
         TriangleMesh mesh = mo.raw_mesh();
-        mesh.require_shared_vertices();
 
         ModelInstance *mi = mo.instances[0];
         auto rotation = Vec3d::Zero();
@@ -437,7 +435,6 @@ Vec2d find_min_z_height_rotation(const ModelObject &mo,
     RotfinderBoilerplate<1000> bp{mo, params};
 
     TriangleMesh chull = bp.mesh.convex_hull_3d();
-    chull.require_shared_vertices();
     auto inputs = reserve_vector<XYRotation>(chull.its.indices.size());
     auto rotcmp = [](const XYRotation &r1, const XYRotation &r2) {
         double xdiff = r1[X] - r2[X], ydiff = r1[Y] - r2[Y];
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index 0b9dde122..004f7d555 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/src/libslic3r/SLAPrint.cpp
@@ -670,7 +670,7 @@ std::string SLAPrint::validate(std::string*) const
     return "";
 }
 
-void SLAPrint::set_printer(SLAPrinter *arch)
+void SLAPrint::set_printer(SLAArchive *arch)
 {
     invalidate_step(slapsRasterize);
     m_printer = arch;
@@ -693,7 +693,7 @@ void SLAPrint::process()
     if (m_objects.empty())
         return;
 
-    name_tbb_thread_pool_threads();
+    name_tbb_thread_pool_threads_set_locale();
 
     // Assumption: at this point the print objects should be populated only with
     // the model objects we have to process and the instances are also filtered
@@ -896,7 +896,6 @@ SLAPrintObject::SLAPrintObject(SLAPrint *print, ModelObject *model_object)
         obj = m_model_object->raw_mesh();
         if (!obj.empty()) {
             obj.transform(m_trafo);
-            obj.require_shared_vertices();
         }
     })
 {}
@@ -1048,15 +1047,15 @@ Vec3d SLAPrint::relative_correction() const
     Vec3d corr(1., 1., 1.);
 
     if(printer_config().relative_correction.values.size() >= 2) {
-        corr(X) = printer_config().relative_correction.values[0];
-        corr(Y) = printer_config().relative_correction.values[0];
-        corr(Z) = printer_config().relative_correction.values.back();
+        corr.x() = printer_config().relative_correction.values[0];
+        corr.y() = corr.x();
+        corr.z() = printer_config().relative_correction.values[1];
     }
 
     if(material_config().material_correction.values.size() >= 2) {
-        corr(X) *= material_config().material_correction.values[0];
-        corr(Y) *= material_config().material_correction.values[0];
-        corr(Z) *= material_config().material_correction.values.back();
+        corr.x() *= material_config().material_correction.values[0];
+        corr.y() =  corr.x();
+        corr.z() *= material_config().material_correction.values[1];
     }
 
     return corr;
diff --git a/src/libslic3r/SLAPrint.hpp b/src/libslic3r/SLAPrint.hpp
index 0cd80f20b..833146985 100644
--- a/src/libslic3r/SLAPrint.hpp
+++ b/src/libslic3r/SLAPrint.hpp
@@ -323,7 +323,6 @@ private:
         {
             support_tree_ptr = sla::SupportTree::create(*this, ctl);
             tree_mesh = TriangleMesh{support_tree_ptr->retrieve_mesh(sla::MeshType::Support)};
-            tree_mesh.require_shared_vertices();
             return support_tree_ptr;
         }
 
@@ -388,15 +387,15 @@ struct SLAPrintStatistics
     }
 };
 
-class SLAPrinter {
+class SLAArchive {
 protected:
     std::vector<sla::EncodedRaster> m_layers;
     
-    virtual uqptr<sla::RasterBase> create_raster() const = 0;
+    virtual std::unique_ptr<sla::RasterBase> create_raster() const = 0;
     virtual sla::RasterEncoder get_encoder() const = 0;
     
 public:
-    virtual ~SLAPrinter() = default;
+    virtual ~SLAArchive() = default;
     
     virtual void apply(const SLAPrinterConfig &cfg) = 0;
     
@@ -527,7 +526,7 @@ public:
     // TODO: use this structure for the preview in the future.
     const std::vector<PrintLayer>& print_layers() const { return m_printer_input; }
     
-    void set_printer(SLAPrinter *archiver);
+    void set_printer(SLAArchive *archiver);
     
 private:
     
@@ -549,7 +548,7 @@ private:
     std::vector<PrintLayer>         m_printer_input;
     
     // The archive object which collects the raster images after slicing
-    SLAPrinter                     *m_printer = nullptr;
+    SLAArchive                     *m_printer = nullptr;
     
     // Estimated print time, material consumed.
     SLAPrintStatistics              m_print_statistics;
diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp
index 4b377d9f1..adec5735a 100644
--- a/src/libslic3r/SLAPrintSteps.cpp
+++ b/src/libslic3r/SLAPrintSteps.cpp
@@ -526,7 +526,6 @@ void SLAPrint::Steps::slice_model(SLAPrintObject &po)
     }
     auto  thr        = [this]() { m_print->throw_if_canceled(); };
     auto &slice_grid = po.m_model_height_levels;
-    assert(mesh.has_shared_vertices());
     po.m_model_slices = slice_mesh_ex(mesh.its, slice_grid, params, thr);
 
     sla::Interior *interior = po.m_hollowing_data ?
diff --git a/src/libslic3r/SimplifyMesh.hpp b/src/libslic3r/SimplifyMesh.hpp
index fb3e73d04..23eb343d1 100644
--- a/src/libslic3r/SimplifyMesh.hpp
+++ b/src/libslic3r/SimplifyMesh.hpp
@@ -14,10 +14,8 @@ void simplify_mesh(indexed_triangle_set &);
 
 template<class...Args> void simplify_mesh(TriangleMesh &m, Args &&...a)
 {
-    m.require_shared_vertices();
     simplify_mesh(m.its, std::forward<Args>(a)...);
-    m = TriangleMesh{m.its};
-    m.require_shared_vertices();
+    m = TriangleMesh{ std::move(m.its) };
 }
 
 } // namespace Slic3r
diff --git a/src/libslic3r/SlicingAdaptive.cpp b/src/libslic3r/SlicingAdaptive.cpp
index 9b9b48f88..30ff67bba 100644
--- a/src/libslic3r/SlicingAdaptive.cpp
+++ b/src/libslic3r/SlicingAdaptive.cpp
@@ -35,13 +35,6 @@ legend("tan(a) as cura - topographic lines distance limit", "sqrt(tan(a)) as Pru
 namespace Slic3r
 {
 
-static inline std::pair<float, float> face_z_span(const stl_facet &f)
-{
-	return std::pair<float, float>(
-		std::min(std::min(f.vertex[0](2), f.vertex[1](2)), f.vertex[2](2)),
-		std::max(std::max(f.vertex[0](2), f.vertex[1](2)), f.vertex[2](2)));
-}
-
 // By Florens Waserfall aka @platch:
 // This constant essentially describes the volumetric error at the surface which is induced 
 // by stacking "elliptic" extrusion threads. It is empirically determined by
@@ -88,10 +81,15 @@ void SlicingAdaptive::prepare(const ModelObject &object)
     mesh.transform(first_instance.get_matrix(), first_instance.is_left_handed());
 
     // 1) Collect faces from mesh.
-    m_faces.reserve(mesh.stl.stats.number_of_facets);
-    for (const stl_facet &face : mesh.stl.facet_start) {
-    	Vec3f n = face.normal.normalized();
-		m_faces.emplace_back(FaceZ({ face_z_span(face), std::abs(n.z()), std::sqrt(n.x() * n.x() + n.y() * n.y()) }));
+    m_faces.reserve(mesh.facets_count());
+	for (stl_triangle_vertex_indices face : mesh.its.indices) {
+		stl_vertex vertex[3] = { mesh.its.vertices[face[0]], mesh.its.vertices[face[1]], mesh.its.vertices[face[2]] };
+		stl_vertex n         = face_normal_normalized(vertex);
+		std::pair<float, float> face_z_span {
+			std::min(std::min(vertex[0].z(), vertex[1].z()), vertex[2].z()),
+			std::max(std::max(vertex[0].z(), vertex[1].z()), vertex[2].z())
+		};
+		m_faces.emplace_back(FaceZ({ face_z_span, std::abs(n.z()), std::sqrt(n.x() * n.x() + n.y() * n.y()) }));
     }
 
 	// 2) Sort faces lexicographically by their Z span.
diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp
index 1b66bcc53..2099cbf73 100644
--- a/src/libslic3r/SupportMaterial.cpp
+++ b/src/libslic3r/SupportMaterial.cpp
@@ -502,7 +502,7 @@ void PrintObjectSupportMaterial::generate(PrintObject &object)
     // If raft is to be generated, the 1st top_contact layer will contain the 1st object layer silhouette with holes filled.
     // There is also a 1st intermediate layer containing bases of support columns.
     // Inflate the bases of the support columns and create the raft base under the object.
-    MyLayersPtr raft_layers = this->generate_raft_base(object, top_contacts, interface_layers, intermediate_layers, base_interface_layers, layer_storage);
+    MyLayersPtr raft_layers = this->generate_raft_base(object, top_contacts, interface_layers, base_interface_layers, intermediate_layers, layer_storage);
 
 #ifdef SLIC3R_DEBUG
     for (const MyLayer *l : interface_layers)
@@ -721,9 +721,9 @@ public:
     #ifdef SUPPORT_USE_AGG_RASTERIZER
             m_bbox       = bbox;
             // Oversample the grid to avoid leaking of supports through or around the object walls.
-            int oversampling = std::min(8, int(scale_(m_support_spacing) / (scale_(params.extrusion_width) + 100)));
-            m_pixel_size = scale_(m_support_spacing / oversampling);
-            assert(scale_(params.extrusion_width) + 20 < m_pixel_size);
+            int extrusion_width_scaled = scale_(params.extrusion_width);
+            int oversampling = std::clamp(int(scale_(m_support_spacing) / (extrusion_width_scaled + 100)), 1, 8);
+            m_pixel_size = std::max<double>(extrusion_width_scaled + 21, scale_(m_support_spacing / oversampling));
             // Add one empty column / row boundaries.
             m_bbox.offset(m_pixel_size);
             // Grid size fitting the support polygons plus one pixel boundary around the polygons.
@@ -1599,7 +1599,8 @@ static inline std::tuple<Polygons, Polygons, Polygons, float> detect_overhangs(
 static inline std::pair<PrintObjectSupportMaterial::MyLayer*, PrintObjectSupportMaterial::MyLayer*> new_contact_layer(
     const PrintConfig                                   &print_config, 
     const PrintObjectConfig                             &object_config,
-    const SlicingParameters                             &slicing_params, 
+    const SlicingParameters                             &slicing_params,
+    const coordf_t                                       support_layer_height_min,
     const Layer                                         &layer, 
     std::deque<PrintObjectSupportMaterial::MyLayer>     &layer_storage,
     tbb::spin_mutex                                     &layer_storage_mutex)
@@ -1629,7 +1630,8 @@ static inline std::pair<PrintObjectSupportMaterial::MyLayer*, PrintObjectSupport
         // Don't want to print a layer below the first layer height as it may not stick well.
         //FIXME there may be a need for a single layer support, then one may decide to print it either as a bottom contact or a top contact
         // and it may actually make sense to do it with a thinner layer than the first layer height.
-        if (print_z < slicing_params.first_print_layer_height - EPSILON) {
+        const coordf_t min_print_z = slicing_params.raft_layers() > 1 ? slicing_params.raft_interface_top_z + support_layer_height_min + EPSILON : slicing_params.first_print_layer_height - EPSILON;
+        if (print_z < min_print_z) {
             // This contact layer is below the first layer height, therefore not printable. Don't support this surface.
             return std::pair<PrintObjectSupportMaterial::MyLayer*, PrintObjectSupportMaterial::MyLayer*>(nullptr, nullptr);
         } else if (print_z < slicing_params.first_print_layer_height + EPSILON) {
@@ -1650,7 +1652,7 @@ static inline std::pair<PrintObjectSupportMaterial::MyLayer*, PrintObjectSupport
                 bridging_height += region->region().bridging_height_avg(print_config);
             bridging_height /= coordf_t(layer.regions().size());
             coordf_t bridging_print_z = layer.print_z - bridging_height - slicing_params.gap_support_object;
-            if (bridging_print_z >= slicing_params.first_print_layer_height - EPSILON) {
+            if (bridging_print_z >= min_print_z) {
                 // Not below the first layer height means this layer is printable.
                 if (print_z < slicing_params.first_print_layer_height + EPSILON) {
                     // Align the layer with the 1st layer height.
@@ -1664,8 +1666,7 @@ static inline std::pair<PrintObjectSupportMaterial::MyLayer*, PrintObjectSupport
                     if (bridging_print_z == slicing_params.first_print_layer_height) {
                         bridging_layer->bottom_z = 0;
                         bridging_layer->height = slicing_params.first_print_layer_height;
-                    }
-                    else {
+                    } else {
                         // Don't know the height yet.
                         bridging_layer->bottom_z = bridging_print_z;
                         bridging_layer->height = 0;
@@ -1917,7 +1918,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::top_contact_
 
                 // Now apply the contact areas to the layer where they need to be made.
                 if (! contact_polygons.empty()) {
-                    auto [new_layer, bridging_layer] = new_contact_layer(*m_print_config, *m_object_config, m_slicing_params, layer, layer_storage, layer_storage_mutex);
+                    auto [new_layer, bridging_layer] = new_contact_layer(*m_print_config, *m_object_config, m_slicing_params, m_support_params.support_layer_height_min, layer, layer_storage, layer_storage_mutex);
                     if (new_layer) {
                         fill_contact_layer(*new_layer, layer_id, m_slicing_params,
                             *m_object_config, slices_margin, overhang_polygons, contact_polygons, enforcer_polygons, lower_layer_polygons,
@@ -2054,21 +2055,21 @@ static inline PrintObjectSupportMaterial::MyLayer* detect_bottom_contacts(
     // Trim the already created base layers above the current layer intersecting with the new bottom contacts layer.
     //FIXME Maybe this is no more needed, as the overlapping base layers are trimmed by the bottom layers at the final stage?
     touching = offset(touching, float(SCALED_EPSILON));
-    for (int layer_id_above = layer_id + 1; layer_id_above < int(object.total_layer_count()); ++layer_id_above) {
+    for (int layer_id_above = layer_id + 1; layer_id_above < int(object.total_layer_count()); ++ layer_id_above) {
         const Layer &layer_above = *object.layers()[layer_id_above];
         if (layer_above.print_z > layer_new.print_z - EPSILON)
             break;
-        if (! layer_support_areas[layer_id_above].empty()) {
+        if (Polygons &above = layer_support_areas[layer_id_above]; ! above.empty()) {
 #ifdef SLIC3R_DEBUG
             SVG::export_expolygons(debug_out_path("support-support-areas-raw-before-trimming-%d-with-%f-%lf.svg", iRun, layer.print_z, layer_above.print_z),
-                { { { union_ex(touching) },                                            { "touching", "blue", 0.5f } },
-                    { { union_safety_offset_ex(layer_support_areas[layer_id_above]) }, { "above",    "red", "black", "", scaled<coord_t>(0.1f), 0.5f } } });
+                { { { union_ex(touching) },              { "touching", "blue", 0.5f } },
+                    { { union_safety_offset_ex(above) }, { "above",    "red", "black", "", scaled<coord_t>(0.1f), 0.5f } } });
 #endif /* SLIC3R_DEBUG */
-            layer_support_areas[layer_id_above] = diff(layer_support_areas[layer_id_above], touching);
+            above = diff(above, touching);
 #ifdef SLIC3R_DEBUG
             Slic3r::SVG::export_expolygons(
                 debug_out_path("support-support-areas-raw-after-trimming-%d-with-%f-%lf.svg", iRun, layer.print_z, layer_above.print_z),
-                union_ex(layer_support_areas[layer_id_above]));
+                union_ex(above));
 #endif /* SLIC3R_DEBUG */
         }
     }
@@ -2600,8 +2601,6 @@ void PrintObjectSupportMaterial::generate_base_layers(
         // No top contacts -> no intermediate layers will be produced.
         return;
 
-    // coordf_t fillet_radius_scaled = scale_(m_object_config->support_material_spacing);
-
     BOOST_LOG_TRIVIAL(debug) << "PrintObjectSupportMaterial::generate_base_layers() in parallel - start";
     tbb::parallel_for(
         tbb::blocked_range<size_t>(0, intermediate_layers.size()),
@@ -2623,10 +2622,9 @@ void PrintObjectSupportMaterial::generate_base_layers(
                 // New polygons for layer_intermediate.
                 Polygons polygons_new;
 
-                // Use the precomputed layer_support_areas.
-                idx_object_layer_above = std::max(0, idx_lower_or_equal(object.layers().begin(), object.layers().end(), idx_object_layer_above, 
-                    [&layer_intermediate](const Layer *layer){ return layer->print_z <= layer_intermediate.print_z + EPSILON; }));
-                polygons_new = layer_support_areas[idx_object_layer_above];
+                // Use the precomputed layer_support_areas. "idx_object_layer_above": above means above since the last iteration, not above after this call.
+                idx_object_layer_above = idx_lower_or_equal(object.layers().begin(), object.layers().end(), idx_object_layer_above,
+                    [&layer_intermediate](const Layer* layer) { return layer->print_z <= layer_intermediate.print_z + EPSILON; });
 
                 // Polygons to trim polygons_new.
                 Polygons polygons_trimming; 
@@ -2641,7 +2639,7 @@ void PrintObjectSupportMaterial::generate_base_layers(
                 idx_top_contact_above = idx_lower_or_equal(top_contacts, idx_top_contact_above, 
                     [&layer_intermediate](const MyLayer *layer){ return layer->bottom_z <= layer_intermediate.print_z - EPSILON; });
                 // Collect all the top_contact layer intersecting with this layer.
-                for ( int idx_top_contact_overlapping = idx_top_contact_above; idx_top_contact_overlapping >= 0; -- idx_top_contact_overlapping) {
+                for (int idx_top_contact_overlapping = idx_top_contact_above; idx_top_contact_overlapping >= 0; -- idx_top_contact_overlapping) {
                     MyLayer &layer_top_overlapping = *top_contacts[idx_top_contact_overlapping];
                     if (layer_top_overlapping.print_z < layer_intermediate.bottom_z + EPSILON)
                         break;
@@ -2652,6 +2650,22 @@ void PrintObjectSupportMaterial::generate_base_layers(
                         polygons_append(polygons_trimming, layer_top_overlapping.polygons);
                 }
 
+                if (idx_object_layer_above < 0) {
+                    // layer_support_areas are synchronized with object layers and they contain projections of the contact layers above them.
+                    // This intermediate layer is not above any object layer, thus there is no information in layer_support_areas about
+                    // towers supporting contact layers intersecting the first object layer. Project these contact layers now.
+                    polygons_new = layer_support_areas.front();
+                    double first_layer_z = object.layers().front()->print_z;
+                    for (int i = idx_top_contact_above + 1; i < int(top_contacts.size()); ++ i) {
+                        MyLayer &contacts = *top_contacts[i];
+                        if (contacts.print_z > first_layer_z + EPSILON)
+                            break;
+                        assert(contacts.bottom_z > layer_intermediate.print_z - EPSILON);
+                        polygons_append(polygons_new, contacts.polygons);
+                    }
+                } else
+                    polygons_new = layer_support_areas[idx_object_layer_above];
+
                 // Trimming the base layer with any overlapping bottom layer.
                 // Following cases are recognized:
                 // 1) bottom.bottom_z >= base.top_z -> No overlap, no trimming needed.
@@ -2696,6 +2710,7 @@ void PrintObjectSupportMaterial::generate_base_layers(
                 layer_intermediate.layer_type = sltBase;
 
         #if 0
+                    // coordf_t fillet_radius_scaled = scale_(m_object_config->support_material_spacing);
                     // Fillet the base polygons and trim them again with the top, interface and contact layers.
                     $base->{$i} = diff(
                         offset2(
@@ -3338,7 +3353,7 @@ void LoopInterfaceProcessor::generate(MyLayerExtruded &top_contact_layer, const
                 Polygon     &contour = (i_contour == 0) ? it_contact_expoly->contour : it_contact_expoly->holes[i_contour - 1];
                 const Point *seg_current_pt = nullptr;
                 coordf_t     seg_current_t  = 0.;
-                if (! intersection_pl((Polylines)contour.split_at_first_point(), overhang_with_margin).empty()) {
+                if (! intersection_pl(contour.split_at_first_point(), overhang_with_margin).empty()) {
                     // The contour is below the overhang at least to some extent.
                     //FIXME ideally one would place the circles below the overhang only.
                     // Walk around the contour and place circles so their centers are not closer than circle_distance from each other.
@@ -3784,7 +3799,7 @@ void PrintObjectSupportMaterial::generate_toolpaths(
     // Prepare fillers.
     SupportMaterialPattern  support_pattern = m_object_config->support_material_pattern;
     bool                    with_sheath     = m_object_config->support_material_with_sheath;
-    InfillPattern           infill_pattern = (support_pattern == smpHoneycomb ? ipHoneycomb : ipSupportBase);
+    InfillPattern           infill_pattern = support_pattern == smpHoneycomb ? ipHoneycomb : (support_density < 1.05 ? ipRectilinear : ipSupportBase);
     std::vector<float>      angles;
     angles.push_back(base_angle);
 
diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index ac92ecd10..350f6aedc 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -41,16 +41,8 @@
 //====================
 #define ENABLE_2_4_0_ALPHA1 1
 
-// Enable delayed rendering of transparent volumes
-#define ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING (1 && ENABLE_2_4_0_ALPHA1)
-// Enable the fix of importing color print view from gcode files into GCodeViewer
-#define ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER (1 && ENABLE_2_4_0_ALPHA1)
-// Enable drawing contours, at cut level, for sinking volumes
-#define ENABLE_SINKING_CONTOURS (1 && ENABLE_2_4_0_ALPHA1)
 // Enable implementation of retract acceleration in gcode processor
 #define ENABLE_RETRACT_ACCELERATION (1 && ENABLE_2_4_0_ALPHA1)
-// Enable the fix for exporting and importing to/from 3mf file of mirrored volumes
-#define ENABLE_FIX_MIRRORED_VOLUMES_3MF_IMPORT_EXPORT (1 && ENABLE_2_4_0_ALPHA1)
 // Enable rendering seams (and other options) in preview using models
 #define ENABLE_SEAMS_USING_MODELS (1 && ENABLE_2_4_0_ALPHA1)
 // Enable save and save as commands to be enabled also when the plater is empty and allow to load empty projects
@@ -65,7 +57,20 @@
 // Enable rendering seams (and other options) in preview using batched models on systems not supporting OpenGL 3.3
 #define ENABLE_SEAMS_USING_BATCHED_MODELS (1 && ENABLE_SEAMS_USING_MODELS && ENABLE_2_4_0_ALPHA2)
 // Enable fixing the z position of color change, pause print and custom gcode markers in preview
-#define ENABLE_FIX_PREVIEW_OPTIONS_Z (1 && ENABLE_SEAMS_USING_MODELS && ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER && ENABLE_2_4_0_ALPHA2)
+#define ENABLE_FIX_PREVIEW_OPTIONS_Z (1 && ENABLE_SEAMS_USING_MODELS && ENABLE_2_4_0_ALPHA2)
+// Enable replacing a missing file during reload from disk command
+#define ENABLE_RELOAD_FROM_DISK_REPLACE_FILE (1 && ENABLE_2_4_0_ALPHA2)
+// Enable fixing the synchronization of seams with the horizontal slider in preview
+#define ENABLE_FIX_SEAMS_SYNCH (1 && ENABLE_2_4_0_ALPHA2)
+
+
+//====================
+// 2.4.0.alpha3 techs
+//====================
+#define ENABLE_2_4_0_ALPHA3 1
+
+// Enable fixing loading of gcode files generated with SuperSlicer in GCodeViewer
+#define ENABLE_FIX_SUPERSLICER_GCODE_IMPORT (1 && ENABLE_2_4_0_ALPHA3)
 
 
 #endif // _prusaslicer_technologies_h_
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index 25c29d273..106da4a78 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -188,7 +188,8 @@ std::optional<std::string> get_current_thread_name()
 #endif // _WIN32
 
 // Spawn (n - 1) worker threads on Intel TBB thread pool and name them by an index and a system thread ID.
-void name_tbb_thread_pool_threads()
+// Also it sets locale of the worker threads to "C" for the G-code generator to produce "." as a decimal separator.
+void name_tbb_thread_pool_threads_set_locale()
 {
 	static bool initialized = false;
 	if (initialized)
@@ -233,6 +234,21 @@ void name_tbb_thread_pool_threads()
 				std::ostringstream name;
 		        name << "slic3r_tbb_" << range.begin();
 		        set_current_thread_name(name.str().c_str());
+		        // Set locales of the worker thread to "C".
+#ifdef _WIN32
+			    _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+			    std::setlocale(LC_ALL, "C");
+#else
+				// We are leaking some memory here, because the newlocale() produced memory will never be released.
+				// This is not a problem though, as there will be a maximum one worker thread created per physical thread.
+				uselocale(newlocale(
+#ifdef __APPLE__
+					LC_ALL_MASK
+#else // some Unix / Linux / BSD
+					LC_ALL
+#endif
+					, "C", nullptr));
+#endif
     		}
         });
 }
diff --git a/src/libslic3r/Thread.hpp b/src/libslic3r/Thread.hpp
index a86123796..9afe13b42 100644
--- a/src/libslic3r/Thread.hpp
+++ b/src/libslic3r/Thread.hpp
@@ -33,7 +33,8 @@ std::optional<std::string> get_current_thread_name();
 
 // To be called somewhere before the TBB threads are spinned for the first time, to
 // give them names recognizible in the debugger.
-void name_tbb_thread_pool_threads();
+// Also it sets locale of the worker threads to "C" for the G-code generator to produce "." as a decimal separator.
+void name_tbb_thread_pool_threads_set_locale();
 
 template<class Fn>
 inline boost::thread create_thread(boost::thread::attributes &attrs, Fn &&fn)
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index fa8f8bce6..bb3c9fc5c 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -7,6 +7,7 @@
 #include "Point.hpp"
 #include "Execution/ExecutionTBB.hpp"
 #include "Execution/ExecutionSeq.hpp"
+#include "Utils.hpp"
 
 #include <libqhullcpp/Qhull.h>
 #include <libqhullcpp/QhullFacetList.h>
@@ -21,6 +22,8 @@
 #include <type_traits>
 
 #include <boost/log/trivial.hpp>
+#include <boost/nowide/cstdio.hpp>
+#include <boost/predef/other/endian.h>
 
 #include <Eigen/Core>
 #include <Eigen/Dense>
@@ -29,74 +32,52 @@
 
 namespace Slic3r {
 
-TriangleMesh::TriangleMesh(const Pointf3s &points, const std::vector<Vec3i> &facets) : repaired(false)
+static void update_bounding_box(const indexed_triangle_set &its, TriangleMeshStats &out)
 {
-    stl_file &stl = this->stl;
-    stl.stats.type = inmemory;
-
-    // count facets and allocate memory
-    stl.stats.number_of_facets = (uint32_t)facets.size();
-    stl.stats.original_num_facets = stl.stats.number_of_facets;
-    stl_allocate(&stl);
-
-    for (uint32_t i = 0; i < stl.stats.number_of_facets; ++ i) {
-        stl_facet facet;
-        facet.vertex[0] = points[facets[i](0)].cast<float>();
-        facet.vertex[1] = points[facets[i](1)].cast<float>();
-        facet.vertex[2] = points[facets[i](2)].cast<float>();
-        facet.extra[0] = 0;
-        facet.extra[1] = 0;
-
-        stl_normal normal;
-        stl_calculate_normal(normal, &facet);
-        stl_normalize_vector(normal);
-        facet.normal = normal;
-
-        stl.facet_start[i] = facet;
-    }
-    stl_get_size(&stl);
+    BoundingBoxf3 bbox      = Slic3r::bounding_box(its);
+    out.min                 = bbox.min.cast<float>();
+    out.max                 = bbox.max.cast<float>();
+    out.size                = out.max - out.min;    
 }
 
-TriangleMesh::TriangleMesh(const indexed_triangle_set &M) : repaired(false)
+static void fill_initial_stats(const indexed_triangle_set &its, TriangleMeshStats &out)
 {
-    stl.stats.type = inmemory;
-    
-    // count facets and allocate memory
-    stl.stats.number_of_facets = uint32_t(M.indices.size());
-    stl.stats.original_num_facets = int(stl.stats.number_of_facets);
-    stl_allocate(&stl);
-    
-    for (uint32_t i = 0; i < stl.stats.number_of_facets; ++ i) {
-        stl_facet facet;
-        facet.vertex[0] = M.vertices[size_t(M.indices[i](0))];
-        facet.vertex[1] = M.vertices[size_t(M.indices[i](1))];
-        facet.vertex[2] = M.vertices[size_t(M.indices[i](2))];
-        facet.extra[0] = 0;
-        facet.extra[1] = 0;
-        
-        stl_normal normal;
-        stl_calculate_normal(normal, &facet);
-        stl_normalize_vector(normal);
-        facet.normal = normal;
-        
-        stl.facet_start[i] = facet;
-    }
-    
-    stl_get_size(&stl);
+    out.number_of_facets    = its.indices.size();
+    out.volume              = its_volume(its);
+    update_bounding_box(its, out);
+
+    const std::vector<Vec3i> face_neighbors = its_face_neighbors(its);
+    out.number_of_parts = its_number_of_patches(its, face_neighbors);
+    out.open_edges      = its_num_open_edges(face_neighbors);
+}
+
+TriangleMesh::TriangleMesh(const std::vector<Vec3f> &vertices, const std::vector<Vec3i> &faces) : its { faces, vertices }
+{
+    fill_initial_stats(this->its, m_stats);
+}
+
+TriangleMesh::TriangleMesh(std::vector<Vec3f> &&vertices, const std::vector<Vec3i> &&faces) : its { std::move(faces), std::move(vertices) }
+{
+    fill_initial_stats(this->its, m_stats);
+}
+
+TriangleMesh::TriangleMesh(const indexed_triangle_set &its) : its(its)
+{
+    fill_initial_stats(this->its, m_stats);
+}
+
+TriangleMesh::TriangleMesh(indexed_triangle_set &&its, const RepairedMeshErrors& errors/* = RepairedMeshErrors()*/) : its(std::move(its))
+{
+    m_stats.repaired_errors = errors;
+    fill_initial_stats(this->its, m_stats);
 }
 
 // #define SLIC3R_TRACE_REPAIR
 
-void TriangleMesh::repair(bool update_shared_vertices)
+static void trianglemesh_repair_on_import(stl_file &stl)
 {
-    if (this->repaired) {
-        if (update_shared_vertices)
-            this->require_shared_vertices();
-        return;
-    }
-
     // admesh fails when repairing empty meshes
-    if (this->stl.stats.number_of_facets == 0)
+    if (stl.stats.number_of_facets == 0)
         return;
 
     BOOST_LOG_TRIVIAL(debug) << "TriangleMesh::repair() started";
@@ -105,9 +86,9 @@ void TriangleMesh::repair(bool update_shared_vertices)
 #ifdef SLIC3R_TRACE_REPAIR
     BOOST_LOG_TRIVIAL(trace) << "\tstl_check_faces_exact";
 #endif /* SLIC3R_TRACE_REPAIR */
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
     stl_check_facets_exact(&stl);
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
     stl.stats.facets_w_1_bad_edge = (stl.stats.connected_facets_2_edge - stl.stats.connected_facets_3_edge);
     stl.stats.facets_w_2_bad_edge = (stl.stats.connected_facets_1_edge - stl.stats.connected_facets_2_edge);
     stl.stats.facets_w_3_bad_edge = (stl.stats.number_of_facets - stl.stats.connected_facets_1_edge);
@@ -117,9 +98,11 @@ void TriangleMesh::repair(bool update_shared_vertices)
     float tolerance = (float)stl.stats.shortest_edge;
     float increment = (float)stl.stats.bounding_diameter / 10000.0f;
     int iterations = 2;
-    if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
-        for (int i = 0; i < iterations; i++) {
-            if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
+    if (stl.stats.connected_facets_3_edge < int(stl.stats.number_of_facets)) {
+        // Not a manifold, some triangles have unconnected edges.
+        for (int i = 0; i < iterations; ++ i) {
+            if (stl.stats.connected_facets_3_edge < int(stl.stats.number_of_facets)) {
+                // Still not a manifold, some triangles have unconnected edges.
                 //printf("Checking nearby. Tolerance= %f Iteration=%d of %d...", tolerance, i + 1, iterations);
 #ifdef SLIC3R_TRACE_REPAIR
                 BOOST_LOG_TRIVIAL(trace) << "\tstl_check_faces_nearby";
@@ -133,7 +116,7 @@ void TriangleMesh::repair(bool update_shared_vertices)
             }
         }
     }
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
     
     // remove_unconnected
     if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
@@ -141,7 +124,7 @@ void TriangleMesh::repair(bool update_shared_vertices)
         BOOST_LOG_TRIVIAL(trace) << "\tstl_remove_unconnected_facets";
 #endif /* SLIC3R_TRACE_REPAIR */
         stl_remove_unconnected_facets(&stl);
-        assert(stl_validate(&this->stl));
+        assert(stl_validate(&stl));
     }
     
     // fill_holes
@@ -162,93 +145,83 @@ void TriangleMesh::repair(bool update_shared_vertices)
     BOOST_LOG_TRIVIAL(trace) << "\tstl_fix_normal_directions";
 #endif /* SLIC3R_TRACE_REPAIR */
     stl_fix_normal_directions(&stl);
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
 
     // normal_values
 #ifdef SLIC3R_TRACE_REPAIR
     BOOST_LOG_TRIVIAL(trace) << "\tstl_fix_normal_values";
 #endif /* SLIC3R_TRACE_REPAIR */
     stl_fix_normal_values(&stl);
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
     
     // always calculate the volume and reverse all normals if volume is negative
 #ifdef SLIC3R_TRACE_REPAIR
     BOOST_LOG_TRIVIAL(trace) << "\tstl_calculate_volume";
 #endif /* SLIC3R_TRACE_REPAIR */
+    // If the volume is negative, all the facets are flipped and added to stats.facets_reversed.
     stl_calculate_volume(&stl);
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
     
     // neighbors
 #ifdef SLIC3R_TRACE_REPAIR
     BOOST_LOG_TRIVIAL(trace) << "\tstl_verify_neighbors";
 #endif /* SLIC3R_TRACE_REPAIR */
     stl_verify_neighbors(&stl);
-    assert(stl_validate(&this->stl));
+    assert(stl_validate(&stl));
 
-    this->repaired = true;
+    //FIXME The admesh repair function may break the face connectivity, rather refresh it here as the slicing code relies on it.
+    if (auto nr_degenerated = stl.stats.degenerate_facets; stl.stats.number_of_facets > 0 && nr_degenerated > 0)
+        stl_check_facets_exact(&stl);
 
     BOOST_LOG_TRIVIAL(debug) << "TriangleMesh::repair() finished";
+}
 
-    // This call should be quite cheap, a lot of code requires the indexed_triangle_set data structure,
-    // and it is risky to generate such a structure once the meshes are shared. Do it now.
-    this->its.clear();
-    if (update_shared_vertices)
-        this->require_shared_vertices();
+bool TriangleMesh::ReadSTLFile(const char* input_file, bool repair)
+{ 
+    stl_file stl;
+    if (! stl_open(&stl, input_file))
+        return false;
+    if (repair)
+        trianglemesh_repair_on_import(stl);
+
+    m_stats.number_of_facets        = stl.stats.number_of_facets;
+    m_stats.min                     = stl.stats.min;
+    m_stats.max                     = stl.stats.max;
+    m_stats.size                    = stl.stats.size;
+    m_stats.volume                  = stl.stats.volume;
+
+    auto facets_w_1_bad_edge = stl.stats.connected_facets_2_edge - stl.stats.connected_facets_3_edge;
+    auto facets_w_2_bad_edge = stl.stats.connected_facets_1_edge - stl.stats.connected_facets_2_edge;
+    auto facets_w_3_bad_edge = stl.stats.number_of_facets - stl.stats.connected_facets_1_edge;
+    m_stats.open_edges              = stl.stats.backwards_edges + facets_w_1_bad_edge + facets_w_2_bad_edge * 2 + facets_w_3_bad_edge * 3;
+
+    m_stats.repaired_errors = { stl.stats.edges_fixed,
+                                stl.stats.degenerate_facets,
+                                stl.stats.facets_removed,
+                                stl.stats.facets_reversed,
+                                stl.stats.backwards_edges };
+
+    m_stats.number_of_parts         = stl.stats.number_of_parts;
+
+    stl_generate_shared_vertices(&stl, this->its);
+    return true;
+}
+
+bool TriangleMesh::write_ascii(const char* output_file)
+{ 
+    return its_write_stl_ascii(output_file, "", this->its);
+}
+
+bool TriangleMesh::write_binary(const char* output_file)
+{ 
+    return its_write_stl_binary(output_file, "", this->its);
 }
 
 float TriangleMesh::volume()
 {
-    if (this->stl.stats.volume == -1) 
-        stl_calculate_volume(&this->stl);
-    return this->stl.stats.volume;
-}
-
-void TriangleMesh::check_topology()
-{
-    // checking exact
-    stl_check_facets_exact(&stl);
-    stl.stats.facets_w_1_bad_edge = (stl.stats.connected_facets_2_edge - stl.stats.connected_facets_3_edge);
-    stl.stats.facets_w_2_bad_edge = (stl.stats.connected_facets_1_edge - stl.stats.connected_facets_2_edge);
-    stl.stats.facets_w_3_bad_edge = (stl.stats.number_of_facets - stl.stats.connected_facets_1_edge);
-    
-    // checking nearby
-    //int last_edges_fixed = 0;
-    float tolerance = stl.stats.shortest_edge;
-    float increment = stl.stats.bounding_diameter / 10000.0;
-    int iterations = 2;
-    if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
-        for (int i = 0; i < iterations; i++) {
-            if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
-                //printf("Checking nearby. Tolerance= %f Iteration=%d of %d...", tolerance, i + 1, iterations);
-                stl_check_facets_nearby(&stl, tolerance);
-                //printf("  Fixed %d edges.\n", stl.stats.edges_fixed - last_edges_fixed);
-                //last_edges_fixed = stl.stats.edges_fixed;
-                tolerance += increment;
-            } else {
-                break;
-            }
-        }
-    }
-}
-
-void TriangleMesh::reset_repair_stats() {
-    this->stl.stats.degenerate_facets   = 0;
-    this->stl.stats.edges_fixed         = 0;
-    this->stl.stats.facets_removed      = 0;
-    this->stl.stats.facets_added        = 0;
-    this->stl.stats.facets_reversed     = 0;
-    this->stl.stats.backwards_edges     = 0;
-    this->stl.stats.normals_fixed       = 0;
-}
-
-bool TriangleMesh::needed_repair() const
-{
-    return this->stl.stats.degenerate_facets    > 0
-        || this->stl.stats.edges_fixed          > 0
-        || this->stl.stats.facets_removed       > 0
-        || this->stl.stats.facets_added         > 0
-        || this->stl.stats.facets_reversed      > 0
-        || this->stl.stats.backwards_edges      > 0;
+    if (m_stats.volume == -1)
+        m_stats.volume = its_volume(this->its);
+    return m_stats.volume;
 }
 
 void TriangleMesh::WriteOBJFile(const char* output_file) const
@@ -258,133 +231,142 @@ void TriangleMesh::WriteOBJFile(const char* output_file) const
 
 void TriangleMesh::scale(float factor)
 {
-    stl_scale(&(this->stl), factor);
-    for (stl_vertex& v : this->its.vertices)
-        v *= factor;
+    this->scale(Vec3f(factor, factor, factor));
 }
 
-void TriangleMesh::scale(const Vec3d &versor)
+void TriangleMesh::scale(const Vec3f &versor)
 {
-    stl_scale_versor(&this->stl, versor.cast<float>());
-    for (stl_vertex& v : this->its.vertices) {
-        v.x() *= versor.x();
-        v.y() *= versor.y();
-        v.z() *= versor.z();
+    // Scale extents.
+    auto s = versor.array();
+    m_stats.min.array() *= s;
+    m_stats.max.array() *= s;
+    // Scale size.
+    m_stats.size.array() *= s;
+    // Scale volume.
+    if (m_stats.volume > 0.0)
+        m_stats.volume *= s(0) * s(1) * s(2);
+    if (versor.x() == versor.y() && versor.x() == versor.z()) {
+        float s = versor.x();
+        for (stl_vertex &v : this->its.vertices)
+            v *= s;
+    } else {
+        for (stl_vertex &v : this->its.vertices) {
+            v.x() *= versor.x();
+            v.y() *= versor.y();
+            v.z() *= versor.z();
+        }
+    }
+}
+
+void TriangleMesh::translate(const Vec3f &displacement)
+{
+    if (displacement.x() != 0.f || displacement.y() != 0.f || displacement.z() != 0.f) {
+        for (stl_vertex& v : this->its.vertices)
+            v += displacement;
+        m_stats.min += displacement;
+        m_stats.max += displacement;
     }
 }
 
 void TriangleMesh::translate(float x, float y, float z)
 {
-    if (x == 0.f && y == 0.f && z == 0.f)
-        return;
-    stl_translate_relative(&(this->stl), x, y, z);
-    stl_vertex shift(x, y, z);
-    for (stl_vertex& v : this->its.vertices)
-        v += shift;
-}
-
-void TriangleMesh::translate(const Vec3f &displacement)
-{
-    translate(displacement(0), displacement(1), displacement(2));
+    this->translate(Vec3f(x, y, z));
 }
 
 void TriangleMesh::rotate(float angle, const Axis &axis)
 {
-    if (angle == 0.f)
-        return;
-
-    // admesh uses degrees
-    angle = Slic3r::Geometry::rad2deg(angle);
-    
-    if (axis == X) {
-        stl_rotate_x(&this->stl, angle);
-        its_rotate_x(this->its, angle);
-    } else if (axis == Y) {
-        stl_rotate_y(&this->stl, angle);
-        its_rotate_y(this->its, angle);
-    } else if (axis == Z) {
-        stl_rotate_z(&this->stl, angle);
-        its_rotate_z(this->its, angle);
+    if (angle != 0.f) {
+        angle = Slic3r::Geometry::rad2deg(angle);
+        switch (axis) {
+        case X:  its_rotate_x(this->its, angle); break;
+        case Y:  its_rotate_y(this->its, angle); break;
+        case Z:  its_rotate_z(this->its, angle); break;
+        default: assert(false);                  return;
+        }
+        update_bounding_box(this->its, this->m_stats);
     }
 }
 
 void TriangleMesh::rotate(float angle, const Vec3d& axis)
 {
-    if (angle == 0.f)
-        return;
-
-    Vec3d axis_norm = axis.normalized();
-    Transform3d m = Transform3d::Identity();
-    m.rotate(Eigen::AngleAxisd(angle, axis_norm));
-    stl_transform(&stl, m);
-    its_transform(its, m);
+    if (angle != 0.f) {
+        Vec3d axis_norm = axis.normalized();
+        Transform3d m = Transform3d::Identity();
+        m.rotate(Eigen::AngleAxisd(angle, axis_norm));
+        its_transform(its, m);
+        update_bounding_box(this->its, this->m_stats);
+    }
 }
 
-void TriangleMesh::mirror(const Axis &axis)
+void TriangleMesh::mirror(const Axis axis)
 {
-    if (axis == X) {
-        stl_mirror_yz(&this->stl);
+    switch (axis) {
+    case X:
+        for (stl_vertex &v : its.vertices)
+            v.x() *= -1.f;
+        break;
+    case Y:
+        for (stl_vertex& v : this->its.vertices)
+            v.y() *= -1.0;
+        break;
+    case Z:
         for (stl_vertex &v : this->its.vertices)
-            v(0) *= -1.0;
-    } else if (axis == Y) {
-        stl_mirror_xz(&this->stl);
-        for (stl_vertex &v : this->its.vertices)
-            v(1) *= -1.0;
-    } else if (axis == Z) {
-        stl_mirror_xy(&this->stl);
-        for (stl_vertex &v : this->its.vertices)
-            v(2) *= -1.0;
-    }
+            v.z() *= -1.0;
+        break;
+    default:
+        assert(false);
+        return;
+    };
+    its_flip_triangles(this->its);
+    int iaxis = int(axis);
+    std::swap(m_stats.min[iaxis], m_stats.max[iaxis]);
+    m_stats.min[iaxis] *= -1.0;
+    m_stats.max[iaxis] *= -1.0;
 }
 
 void TriangleMesh::transform(const Transform3d& t, bool fix_left_handed)
 {
-    stl_transform(&stl, t);
     its_transform(its, t);
-    if (fix_left_handed && t.matrix().block(0, 0, 3, 3).determinant() < 0.) {
-        // Left handed transformation is being applied. It is a good idea to flip the faces and their normals.
-        // As for the assert: the repair function would fix the normals, reversing would
-        // break them again. The caller should provide a mesh that does not need repair.
-        // The repair call is left here so things don't break more than they were.
-        assert(this->repaired);
-        this->repair(false);
-        stl_reverse_all_facets(&stl);
-        this->its.clear();
-        this->require_shared_vertices();
+    double det = t.matrix().block(0, 0, 3, 3).determinant();
+    if (fix_left_handed && det < 0.) {
+        its_flip_triangles(its);
+        det = -det;
     }
+    m_stats.volume *= det;
+    update_bounding_box(this->its, this->m_stats);
 }
 
 void TriangleMesh::transform(const Matrix3d& m, bool fix_left_handed)
 {
-    stl_transform(&stl, m);
     its_transform(its, m);
-    if (fix_left_handed && m.determinant() < 0.) {
-        // See comments in function above.
-        assert(this->repaired);
-        this->repair(false);
-        stl_reverse_all_facets(&stl);
-        this->its.clear();
-        this->require_shared_vertices();
+    double det = m.block(0, 0, 3, 3).determinant();
+    if (fix_left_handed && det < 0.) {
+        its_flip_triangles(its);
+        det = -det;
     }
+    m_stats.volume *= det;
+    update_bounding_box(this->its, this->m_stats);
+}
+
+void TriangleMesh::flip_triangles()
+{
+    its_flip_triangles(its);
+    m_stats.volume = - m_stats.volume;
 }
 
 void TriangleMesh::align_to_origin()
 {
-    this->translate(
-        - this->stl.stats.min(0),
-        - this->stl.stats.min(1),
-        - this->stl.stats.min(2));
+    this->translate(- m_stats.min(0), - m_stats.min(1), - m_stats.min(2));
 }
 
 void TriangleMesh::rotate(double angle, Point* center)
 {
-    if (angle == 0.)
-        return;
-    Vec2f c = center->cast<float>();
-    this->translate(-c(0), -c(1), 0);
-    stl_rotate_z(&this->stl, (float)angle);
-    its_rotate_z(this->its, (float)angle);
-    this->translate(c(0), c(1), 0);
+    if (angle != 0.) {
+        Vec2f c = center->cast<float>();
+        this->translate(-c(0), -c(1), 0);
+        its_rotate_z(this->its, (float)angle);
+        this->translate(c(0), c(1), 0);
+    }
 }
 
 /**
@@ -392,145 +374,36 @@ void TriangleMesh::rotate(double angle, Point* center)
  */
 bool TriangleMesh::is_splittable() const
 {
-    std::vector<unsigned char> visited;
-    find_unvisited_neighbors(visited);
-
-    // Try finding an unvisited facet. If there are none, the mesh is not splittable.
-    auto it = std::find(visited.begin(), visited.end(), false);
-    return it != visited.end();
+    return its_is_splittable(this->its);
 }
 
-/**
- * Visit all unvisited neighboring facets that are reachable from the first unvisited facet,
- * and return them.
- * 
- * @param facet_visited A reference to a vector of booleans. Contains whether or not a
- *                      facet with the same index has been visited.
- * @return A deque with all newly visited facets.
- */
-std::deque<uint32_t> TriangleMesh::find_unvisited_neighbors(std::vector<unsigned char> &facet_visited) const
+std::vector<TriangleMesh> TriangleMesh::split() const
 {
-    // Make sure we're not operating on a broken mesh.
-    if (!this->repaired)
-        throw Slic3r::RuntimeError("find_unvisited_neighbors() requires repair()");
+    std::vector<indexed_triangle_set> itss = its_split(this->its);
+    std::vector<TriangleMesh> out;
+    out.reserve(itss.size());
+    for (indexed_triangle_set &m : itss) {
+        // The TriangleMesh constructor shall fill in the mesh statistics including volume.
+        out.emplace_back(std::move(m));
+        if (TriangleMesh &triangle_mesh = out.back(); triangle_mesh.volume() < 0)
+            // Some source mesh parts may be incorrectly oriented. Correct them.
+            triangle_mesh.flip_triangles();
 
-    // If the visited list is empty, populate it with false for every facet.
-    if (facet_visited.empty())
-        facet_visited = std::vector<unsigned char>(this->stl.stats.number_of_facets, false);
-
-    // Find the first unvisited facet.
-    std::queue<uint32_t> facet_queue;
-    std::deque<uint32_t> facets;
-    auto facet = std::find(facet_visited.begin(), facet_visited.end(), false);
-    if (facet != facet_visited.end()) {
-        uint32_t idx = uint32_t(facet - facet_visited.begin());
-        facet_queue.push(idx);
-        facet_visited[idx] = true;
-        facets.emplace_back(idx);
     }
-
-    // Traverse all reachable neighbors and mark them as visited.
-    while (! facet_queue.empty()) {
-        uint32_t facet_idx = facet_queue.front();
-        facet_queue.pop();
-        for (int neighbor_idx : this->stl.neighbors_start[facet_idx].neighbor)
-            if (neighbor_idx != -1 && ! facet_visited[neighbor_idx]) {
-                facet_queue.push(uint32_t(neighbor_idx));
-                facet_visited[neighbor_idx] = true;
-                facets.emplace_back(uint32_t(neighbor_idx));
-            }
-    }
-
-    return facets;
-}
-
-/**
- * Splits a mesh into multiple meshes when possible.
- * 
- * @return A TriangleMeshPtrs with the newly created meshes.
- */
-TriangleMeshPtrs TriangleMesh::split() const
-{
-    struct MeshAdder {
-        TriangleMeshPtrs &meshes;
-        MeshAdder(TriangleMeshPtrs &ptrs): meshes{ptrs} {}
-        void operator=(const indexed_triangle_set &its)
-        {
-            meshes.emplace_back(new TriangleMesh(its));
-        }
-    };
-
-    TriangleMeshPtrs meshes;
-    if (has_shared_vertices()) {
-        its_split(its, MeshAdder{meshes});
-    } else {
-        // Loop while we have remaining facets.
-        std::vector<unsigned char> facet_visited;
-        for (;;) {
-            std::deque<uint32_t> facets = find_unvisited_neighbors(facet_visited);
-            if (facets.empty())
-                break;
-
-            // Create a new mesh for the part that was just split off.
-            TriangleMesh* mesh = new TriangleMesh;
-            meshes.emplace_back(mesh);
-            mesh->stl.stats.type = inmemory;
-            mesh->stl.stats.number_of_facets = (uint32_t)facets.size();
-            mesh->stl.stats.original_num_facets = mesh->stl.stats.number_of_facets;
-            stl_allocate(&mesh->stl);
-
-            // Assign the facets to the new mesh.
-            bool first = true;
-            for (auto facet = facets.begin(); facet != facets.end(); ++ facet) {
-                mesh->stl.facet_start[facet - facets.begin()] = this->stl.facet_start[*facet];
-                stl_facet_stats(&mesh->stl, this->stl.facet_start[*facet], first);
-            }
-        }
-    }
-
-    return meshes;
+    return out;
 }
 
 void TriangleMesh::merge(const TriangleMesh &mesh)
 {
-    // reset stats and metadata
-    int number_of_facets = this->stl.stats.number_of_facets;
-    this->its.clear();
-    this->repaired = false;
-    
-    // update facet count and allocate more memory
-    this->stl.stats.number_of_facets = number_of_facets + mesh.stl.stats.number_of_facets;
-    this->stl.stats.original_num_facets = this->stl.stats.number_of_facets;
-    stl_reallocate(&this->stl);
-    
-    // copy facets
-    for (uint32_t i = 0; i < mesh.stl.stats.number_of_facets; ++ i)
-        this->stl.facet_start[number_of_facets + i] = mesh.stl.facet_start[i];
-    
-    // update size
-    stl_get_size(&this->stl);
+    its_merge(this->its, mesh.its);
+    m_stats = m_stats.merge(mesh.m_stats);
 }
 
 // Calculate projection of the mesh into the XY plane, in scaled coordinates.
 //FIXME This could be extremely slow! Use it for tiny meshes only!
 ExPolygons TriangleMesh::horizontal_projection() const
 {
-    ClipperLib::Paths   paths;
-    Polygon             p;
-    p.points.assign(3, Point());
-    auto                delta = scaled<float>(0.01);
-    std::vector<float>  deltas { delta, delta, delta };
-    paths.reserve(this->stl.stats.number_of_facets);
-    for (const stl_facet &facet : this->stl.facet_start) {
-        p.points[0] = Point::new_scale(facet.vertex[0](0), facet.vertex[0](1));
-        p.points[1] = Point::new_scale(facet.vertex[1](0), facet.vertex[1](1));
-        p.points[2] = Point::new_scale(facet.vertex[2](0), facet.vertex[2](1));
-        p.make_counter_clockwise();
-        paths.emplace_back(mittered_offset_path_scaled(p.points, deltas, 3.));
-    }
-    
-    // the offset factor was tuned using groovemount.stl
-    return ClipperPaths_to_Slic3rExPolygons(paths);
+    return union_ex(project_mesh(this->its, Transform3d::Identity(), []() {}));
 }
 
 // 2D convex hull of a 3D mesh projected into the Z=0 plane.
@@ -549,24 +422,16 @@ BoundingBoxf3 TriangleMesh::bounding_box() const
 {
     BoundingBoxf3 bb;
     bb.defined = true;
-    bb.min = this->stl.stats.min.cast<double>();
-    bb.max = this->stl.stats.max.cast<double>();
+    bb.min = m_stats.min.cast<double>();
+    bb.max = m_stats.max.cast<double>();
     return bb;
 }
 
 BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d &trafo) const
 {
     BoundingBoxf3 bbox;
-    if (this->its.vertices.empty()) {
-        // Using the STL faces.
-        for (const stl_facet &facet : this->stl.facet_start)
-            for (size_t j = 0; j < 3; ++ j)
-                bbox.merge(trafo * facet.vertex[j].cast<double>());
-    } else {
-        // Using the shared vertices should be a bit quicker than using the STL faces.
-        for (const stl_vertex &v : this->its.vertices)
-            bbox.merge(trafo * v.cast<double>());
-    }
+    for (const stl_vertex &v : this->its.vertices)
+        bbox.merge(trafo * v.cast<double>());
     return bbox;
 }
 
@@ -578,26 +443,16 @@ TriangleMesh TriangleMesh::convex_hull_3d() const
     std::vector<realT> src_vertices;
     try
     {
-        if (this->has_shared_vertices()) {
 #if REALfloat
-            qhull.runQhull("", 3, (int)this->its.vertices.size(), (const realT*)(this->its.vertices.front().data()), "Qt");
+        qhull.runQhull("", 3, (int)this->its.vertices.size(), (const realT*)(this->its.vertices.front().data()), "Qt");
 #else
-            src_vertices.reserve(this->its.vertices.size() * 3);
-            // We will now fill the vector with input points for computation:
-            for (const stl_vertex &v : this->its.vertices)
-                for (int i = 0; i < 3; ++ i)
-                    src_vertices.emplace_back(v(i));
-            qhull.runQhull("", 3, (int)src_vertices.size() / 3, src_vertices.data(), "Qt");
+        src_vertices.reserve(this->its.vertices.size() * 3);
+        // We will now fill the vector with input points for computation:
+        for (const stl_vertex &v : this->its.vertices)
+            for (int i = 0; i < 3; ++ i)
+                src_vertices.emplace_back(v(i));
+        qhull.runQhull("", 3, (int)src_vertices.size() / 3, src_vertices.data(), "Qt");
 #endif
-        } else {
-            src_vertices.reserve(this->stl.facet_start.size() * 9);
-            // We will now fill the vector with input points for computation:
-            for (const stl_facet &f : this->stl.facet_start)
-                for (int i = 0; i < 3; ++ i)
-                    for (int j = 0; j < 3; ++ j)
-                        src_vertices.emplace_back(f.vertex[i](j));
-            qhull.runQhull("", 3, (int)src_vertices.size() / 3, src_vertices.data(), "Qt");
-        }
     }
     catch (...)
     {
@@ -606,84 +461,77 @@ TriangleMesh TriangleMesh::convex_hull_3d() const
     }
 
     // Let's collect results:
-    Pointf3s dst_vertices;
-    std::vector<Vec3i> facets;
-    auto facet_list = qhull.facetList().toStdVector();
-    for (const orgQhull::QhullFacet& facet : facet_list)
-    {   // iterate through facets
-        orgQhull::QhullVertexSet vertices = facet.vertices();
-        for (int i = 0; i < 3; ++i)
-        {   // iterate through facet's vertices
-
-            orgQhull::QhullPoint p = vertices[i].point();
-            const auto* coords = p.coordinates();
-            dst_vertices.emplace_back(coords[0], coords[1], coords[2]);
+    std::vector<Vec3f>  dst_vertices;
+    std::vector<Vec3i>  dst_facets;
+    // Map of QHull's vertex ID to our own vertex ID (pointing to dst_vertices).
+    std::vector<int>    map_dst_vertices;
+#ifndef NDEBUG
+    Vec3f               centroid = Vec3f::Zero();
+    for (const stl_vertex& pt : this->its.vertices)
+        centroid += pt;
+    centroid /= float(this->its.vertices.size());
+#endif // NDEBUG
+    for (const orgQhull::QhullFacet facet : qhull.facetList()) {
+        // Collect face vertices first, allocate unique vertices in dst_vertices based on QHull's vertex ID.
+        Vec3i  indices;
+        int    cnt = 0;
+        for (const orgQhull::QhullVertex vertex : facet.vertices()) {
+            int id = vertex.id();
+            assert(id >= 0);
+            if (id >= int(map_dst_vertices.size()))
+                map_dst_vertices.resize(next_highest_power_of_2(size_t(id + 1)), -1);
+            if (int i = map_dst_vertices[id]; i == -1) {
+                // Allocate a new vertex.
+                i = int(dst_vertices.size());
+                map_dst_vertices[id] = i;
+                orgQhull::QhullPoint pt(vertex.point());
+                dst_vertices.emplace_back(pt[0], pt[1], pt[2]);
+                indices[cnt] = i;
+            } else {
+                // Reuse existing vertex.
+                indices[cnt] = i;
+            }
+            if (cnt ++ == 3)
+                break;
+        }
+        assert(cnt == 3);
+        if (cnt == 3) {
+            // QHull sorts vertices of a face lexicographically by their IDs, not by face normals.
+            // Calculate face normal based on the order of vertices.
+            Vec3f n  = (dst_vertices[indices(1)] - dst_vertices[indices(0)]).cross(dst_vertices[indices(2)] - dst_vertices[indices(1)]);
+            auto *n2 = facet.getBaseT()->normal;
+            auto  d = n.x() * n2[0] + n.y() * n2[1] + n.z() * n2[2];
+#ifndef NDEBUG
+            Vec3f n3 = (dst_vertices[indices(0)] - centroid);
+            auto  d3 = n.dot(n3);
+            assert((d < 0.f) == (d3 < 0.f));
+#endif // NDEBUG
+            // Get the face normal from QHull.
+            if (d < 0.f)
+                // Fix face orientation.
+                std::swap(indices[1], indices[2]);
+            dst_facets.emplace_back(indices);
         }
-        unsigned int size = (unsigned int)dst_vertices.size();
-        facets.emplace_back(size - 3, size - 2, size - 1);
     }
 
-    TriangleMesh output_mesh(dst_vertices, facets);
-    output_mesh.repair();
-    return output_mesh;
+    TriangleMesh mesh{ std::move(dst_vertices), std::move(dst_facets) };
+    assert(mesh.stats().manifold());
+    return mesh;
 }
 
 std::vector<ExPolygons> TriangleMesh::slice(const std::vector<double> &z) const
 {
     // convert doubles to floats
     std::vector<float> z_f(z.begin(), z.end());
-    assert(this->has_shared_vertices());
     return slice_mesh_ex(this->its, z_f, 0.0004f);
 }
 
-void TriangleMesh::require_shared_vertices()
-{
-    BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::require_shared_vertices - start";
-    assert(stl_validate(&this->stl));
-    if (! this->repaired) 
-        this->repair();
-    if (this->its.vertices.empty()) {
-        BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::require_shared_vertices - stl_generate_shared_vertices";
-        stl_generate_shared_vertices(&this->stl, this->its);
-    }
-    assert(stl_validate(&this->stl, this->its));
-    BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::require_shared_vertices - end";
-}
-
 size_t TriangleMesh::memsize() const
 {
-    size_t memsize = 8 + this->stl.memsize() + this->its.memsize();
+    size_t memsize = 8 + this->its.memsize() + sizeof(this->m_stats);
     return memsize;
 }
 
-// Release optional data from the mesh if the object is on the Undo / Redo stack only. Returns the amount of memory released.
-size_t TriangleMesh::release_optional()
-{
-    size_t memsize_released = sizeof(stl_neighbors) * this->stl.neighbors_start.size() + this->its.memsize();
-    // The indexed triangle set may be recalculated using the stl_generate_shared_vertices() function.
-    this->its.clear();
-    // The neighbors structure may be recalculated using the stl_check_facets_exact() function.
-    this->stl.neighbors_start.clear();
-    return memsize_released;
-}
-
-// Restore optional data possibly released by release_optional().
-void TriangleMesh::restore_optional()
-{
-    if (! this->stl.facet_start.empty()) {
-        // Save the old stats before calling stl_check_faces_exact, as it may modify the statistics.
-        stl_stats stats = this->stl.stats;
-        if (this->stl.neighbors_start.empty()) {
-            stl_reallocate(&this->stl);
-            stl_check_facets_exact(&this->stl);
-        }
-        if (this->its.vertices.empty())
-            stl_generate_shared_vertices(&this->stl, this->its);
-        // Restore the old statistics.
-        this->stl.stats = stats;
-    }
-}
-
 // Create a mapping from triangle edge into face.
 struct EdgeToFace {
     // Index of the 1st vertex of the triangle edge. vertex_low <= vertex_high.
@@ -1059,21 +907,32 @@ Polygon its_convex_hull_2d_above(const indexed_triangle_set &its, const Transfor
 indexed_triangle_set its_make_cube(double xd, double yd, double zd)
 {
     auto x = float(xd), y = float(yd), z = float(zd);
-    indexed_triangle_set mesh;
-    mesh.vertices = {{x, y, 0}, {x, 0, 0}, {0, 0, 0}, {0, y, 0},
-                     {x, y, z}, {0, y, z}, {0, 0, z}, {x, 0, z}};
-    mesh.indices  = {{0, 1, 2}, {0, 2, 3}, {4, 5, 6}, {4, 6, 7},
-                    {0, 4, 7}, {0, 7, 1}, {1, 7, 6}, {1, 6, 2},
-                    {2, 6, 5}, {2, 5, 3}, {4, 0, 3}, {4, 3, 5}};
-
-    return mesh;
+    return {
+        { {0, 1, 2}, {0, 2, 3}, {4, 5, 6}, {4, 6, 7},
+          {0, 4, 7}, {0, 7, 1}, {1, 7, 6}, {1, 6, 2},
+          {2, 6, 5}, {2, 5, 3}, {4, 0, 3}, {4, 3, 5} },
+        { {x, y, 0}, {x, 0, 0}, {0, 0, 0}, {0, y, 0},
+          {x, y, z}, {0, y, z}, {0, 0, z}, {x, 0, z} }
+    };
 }
 
-TriangleMesh make_cube(double x, double y, double z) 
+indexed_triangle_set its_make_prism(float width, float length, float height)
 {
-    TriangleMesh mesh(its_make_cube(x, y, z));
-    mesh.repair();
-    return mesh;
+    // We need two upward facing triangles
+    float x = width / 2.f, y = length / 2.f;
+    return {
+        {
+            {0, 1, 2}, // side 1
+            {4, 3, 5}, // side 2
+            {1, 4, 2}, {2, 4, 5}, // roof 1
+            {0, 2, 5}, {0, 5, 3}, // roof 2
+            {3, 4, 1}, {3, 1, 0} // bottom
+        },
+        {
+            {-x, -y, 0.f}, {x, -y, 0.f}, {0.f, -y, height},
+            {-x, y, 0.f}, {x, y, 0.f}, {0.f, y, height},
+        }
+    };
 }
 
 // Generate the mesh for a cylinder and return it, using 
@@ -1121,23 +980,17 @@ indexed_triangle_set its_make_cylinder(double r, double h, double fa)
     return mesh;
 }
 
-TriangleMesh make_cylinder(double r, double h, double fa)
+indexed_triangle_set its_make_cone(double r, double h, double fa)
 {
-    TriangleMesh mesh{its_make_cylinder(r, h, fa)};
-    mesh.repair();
+    indexed_triangle_set mesh;
+    auto& vertices = mesh.vertices;
+    auto& facets = mesh.indices;
+    vertices.reserve(3 + 2 * size_t(2 * PI / fa));
 
-    return mesh;
-}
+    // base center and top vertex
+    vertices.emplace_back(Vec3f::Zero());
+    vertices.emplace_back(Vec3f(0., 0., h));
 
-
-TriangleMesh make_cone(double r, double h, double fa)
-{
-    Pointf3s vertices;
-    std::vector<Vec3i>	facets;
-    vertices.reserve(3+size_t(2*PI/fa));
-    vertices.reserve(3+2*size_t(2*PI/fa));
-
-    vertices = { Vec3d::Zero(), Vec3d(0., 0., h) }; // base center and top vertex
     size_t i = 0;
     for (double angle=0; angle<2*PI; angle+=fa) {
         vertices.emplace_back(r*std::cos(angle), r*std::sin(angle), 0.);
@@ -1150,11 +1003,27 @@ TriangleMesh make_cone(double r, double h, double fa)
     facets.emplace_back(0, 2, i+1); // close the shape
     facets.emplace_back(1, i+1, 2);
 
-    TriangleMesh mesh(std::move(vertices), std::move(facets));
-    mesh.repair();
     return mesh;
 }
 
+indexed_triangle_set its_make_pyramid(float base, float height)
+{
+    float a = base / 2.f;
+    return {
+        {
+            {0, 1, 2},
+            {0, 2, 3},
+            {0, 1, 4},
+            {1, 2, 4},
+            {2, 3, 4},
+            {3, 0, 4}
+        },
+        {
+            {-a, -a, 0}, {a, -a, 0}, {a, a, 0},
+            {-a, a, 0}, {0.f, 0.f, height}
+        }
+    };
+}
 
 // Generates mesh for a sphere centered about the origin, using the generated angle
 // to determine the granularity. 
@@ -1214,12 +1083,10 @@ indexed_triangle_set its_make_sphere(double radius, double fa)
     return mesh;
 }
 
-TriangleMesh make_sphere(double radius, double fa)
+void its_reverse_all_facets(indexed_triangle_set &its)
 {
-    TriangleMesh mesh(its_make_sphere(radius, fa));
-    mesh.repair();
-
-    return mesh;
+    for (stl_triangle_vertex_indices &face : its.indices)
+        std::swap(face[0], face[1]);
 }
 
 void its_merge(indexed_triangle_set &A, const indexed_triangle_set &B)
@@ -1295,10 +1162,40 @@ std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its)
     return its_split<>(its);
 }
 
+// Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices).
+bool its_number_of_patches(const indexed_triangle_set &its)
+{
+    return its_number_of_patches<>(its);
+}
+bool its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors)
+{
+    return its_number_of_patches<>(ItsNeighborsWrapper{ its, face_neighbors });
+}
+
+// Same as its_number_of_patches(its) > 1, but faster.
 bool its_is_splittable(const indexed_triangle_set &its)
 {
     return its_is_splittable<>(its);
 }
+bool its_is_splittable(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors)
+{
+    return its_is_splittable<>(ItsNeighborsWrapper{ its, face_neighbors });
+}
+
+size_t its_num_open_edges(const std::vector<Vec3i> &face_neighbors)
+{
+    size_t num_open_edges = 0;
+    for (Vec3i neighbors : face_neighbors)
+        for (int n : neighbors)
+            if (n < 0)
+                ++ num_open_edges;
+    return num_open_edges;
+}
+
+size_t its_num_open_edges(const indexed_triangle_set &its)
+{
+    return its_num_open_edges(its_face_neighbors(its));
+}
 
 void VertexFaceIndex::create(const indexed_triangle_set &its)
 {
@@ -1335,4 +1232,88 @@ std::vector<Vec3i> its_face_neighbors_par(const indexed_triangle_set &its)
     return create_face_neighbors_index(ex_tbb, its);
 }
 
+std::vector<Vec3f> its_face_normals(const indexed_triangle_set &its) 
+{
+    std::vector<Vec3f> normals;
+    normals.reserve(its.indices.size());
+    for (stl_triangle_vertex_indices face : its.indices)
+        normals.push_back(its_face_normal(its, face));
+    return normals;
+}
+
+#if BOOST_ENDIAN_LITTLE_BYTE
+static inline void big_endian_reverse_quads(char*, size_t) {}
+#else // BOOST_ENDIAN_LITTLE_BYTE
+static inline void big_endian_reverse_quads(char *buf, size_t cnt)
+{
+    for (size_t i = 0; i < cnt; i += 4) {
+        std::swap(buf[i], buf[i+3]);
+        std::swap(buf[i+1], buf[i+2]);
+    }
+}
+#endif // BOOST_ENDIAN_LITTLE_BYTE
+
+bool its_write_stl_ascii(const char *file, const char *label, const std::vector<stl_triangle_vertex_indices> &indices, const std::vector<stl_vertex> &vertices)
+{
+    FILE *fp = boost::nowide::fopen(file, "w");
+    if (fp == nullptr) {
+        BOOST_LOG_TRIVIAL(error) << "its_write_stl_ascii: Couldn't open " << file << " for writing";
+        return false;
+    }
+
+    fprintf(fp, "solid  %s\n", label);
+
+    for (const stl_triangle_vertex_indices& face : indices) {
+        Vec3f vertex[3] = { vertices[face(0)], vertices[face(1)], vertices[face(2)] };
+        Vec3f normal    = (vertex[1] - vertex[0]).cross(vertex[2] - vertex[1]).normalized();
+        fprintf(fp, "  facet normal % .8E % .8E % .8E\n", normal(0), normal(1), normal(2));
+        fprintf(fp, "    outer loop\n");
+        fprintf(fp, "      vertex % .8E % .8E % .8E\n", vertex[0](0), vertex[0](1), vertex[0](2));
+        fprintf(fp, "      vertex % .8E % .8E % .8E\n", vertex[1](0), vertex[1](1), vertex[1](2));
+        fprintf(fp, "      vertex % .8E % .8E % .8E\n", vertex[2](0), vertex[2](1), vertex[2](2));
+        fprintf(fp, "    endloop\n");
+        fprintf(fp, "  endfacet\n");
+    }
+
+    fprintf(fp, "endsolid  %s\n", label);
+    fclose(fp);
+    return true;
+}
+
+bool its_write_stl_binary(const char *file, const char *label, const std::vector<stl_triangle_vertex_indices> &indices, const std::vector<stl_vertex> &vertices)
+{
+    FILE *fp = boost::nowide::fopen(file, "wb");
+    if (fp == nullptr) {
+        BOOST_LOG_TRIVIAL(error) << "its_write_stl_binary: Couldn't open " << file << " for writing";
+        return false;
+    }
+
+    {
+        static constexpr const int header_size = 80;
+        std::vector<char> header(header_size, 0);
+        if (int header_len = std::min((label == nullptr) ? 0 : int(strlen(label)), header_size); header_len > 0)
+            ::memcpy(header.data(), label, header_len);
+        ::fwrite(header.data(), header_size, 1, fp);
+    }
+
+    uint32_t nfaces = indices.size();
+    big_endian_reverse_quads(reinterpret_cast<char*>(&nfaces), 4);
+    ::fwrite(&nfaces, 4, 1, fp);
+
+    stl_facet f;
+    f.extra[0] = 0;
+    f.extra[1] = 0;
+    for (const stl_triangle_vertex_indices& face : indices) {
+        f.vertex[0] = vertices[face(0)];
+        f.vertex[1] = vertices[face(1)];
+        f.vertex[2] = vertices[face(2)];
+        f.normal = (f.vertex[1] - f.vertex[0]).cross(f.vertex[2] - f.vertex[1]).normalized();
+        big_endian_reverse_quads(reinterpret_cast<char*>(&f), 48);
+        fwrite(&f, 50, 1, fp);
+    }
+
+    fclose(fp);
+    return true;
+}
+
 } // namespace Slic3r
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index c463af5a2..5223631c0 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -15,25 +15,91 @@ namespace Slic3r {
 
 class TriangleMesh;
 class TriangleMeshSlicer;
-typedef std::vector<TriangleMesh*> TriangleMeshPtrs;
+
+struct RepairedMeshErrors {
+    // How many edges were united by merging their end points with some other end points in epsilon neighborhood?
+    int           edges_fixed               = 0;
+    // How many degenerate faces were removed?
+    int           degenerate_facets         = 0;
+    // How many faces were removed during fixing? Includes degenerate_faces and disconnected faces.
+    int           facets_removed            = 0;
+    // New faces could only be created with stl_fill_holes() and we ditched stl_fill_holes(), because mostly it does more harm than good.
+    //int          facets_added             = 0;
+    // How many facets were revesed? Faces are reversed by admesh while it connects patches of triangles togeter and a flipped triangle is encountered.
+    // Also the facets are reversed when a negative volume is corrected by flipping all facets.
+    int           facets_reversed           = 0;
+    // Edges shared by two triangles, oriented incorrectly.
+    int           backwards_edges           = 0;
+
+    void clear() { *this = RepairedMeshErrors(); }
+
+    void merge(const RepairedMeshErrors& rhs) {
+        this->edges_fixed         += rhs.edges_fixed;
+        this->degenerate_facets   += rhs.degenerate_facets;
+        this->facets_removed      += rhs.facets_removed;
+        this->facets_reversed     += rhs.facets_reversed;
+        this->backwards_edges     += rhs.backwards_edges;
+    }
+
+    bool repaired() const { return degenerate_facets > 0 || edges_fixed > 0 || facets_removed > 0 || facets_reversed > 0 || backwards_edges > 0; }
+};
+
+struct TriangleMeshStats {
+    // Mesh metrics.
+    uint32_t      number_of_facets          = 0;
+    stl_vertex    max                       = stl_vertex::Zero();
+    stl_vertex    min                       = stl_vertex::Zero();
+    stl_vertex    size                      = stl_vertex::Zero();
+    float         volume                    = -1.f;
+    int           number_of_parts           = 0;
+
+    // Mesh errors, remaining.
+    int           open_edges                = 0;
+
+    // Mesh errors, fixed.
+    RepairedMeshErrors repaired_errors;
+
+    void clear() { *this = TriangleMeshStats(); }
+
+    TriangleMeshStats merge(const TriangleMeshStats &rhs) const {
+      if (this->number_of_facets == 0)
+        return rhs;
+      else if (rhs.number_of_facets == 0)
+        return *this;
+      else {
+        TriangleMeshStats out;
+        out.number_of_facets        = this->number_of_facets + rhs.number_of_facets;
+        out.min                     = this->min.cwiseMin(rhs.min);
+        out.max                     = this->max.cwiseMax(rhs.max);
+        out.size                    = out.max - out.min;
+        out.number_of_parts         = this->number_of_parts     + rhs.number_of_parts;
+        out.open_edges              = this->open_edges          + rhs.open_edges;
+        out.volume                  = this->volume              + rhs.volume;
+        out.repaired_errors.merge(rhs.repaired_errors);
+        return out;
+      }
+    }
+
+    bool manifold() const { return open_edges == 0; }
+    bool repaired() const { return repaired_errors.repaired(); }
+};
 
 class TriangleMesh
 {
 public:
-    TriangleMesh() : repaired(false) {}
-    TriangleMesh(const Pointf3s &points, const std::vector<Vec3i> &facets);
+    TriangleMesh() = default;
+    TriangleMesh(const std::vector<Vec3f> &vertices, const std::vector<Vec3i> &faces);
+    TriangleMesh(std::vector<Vec3f> &&vertices, const std::vector<Vec3i> &&faces);
     explicit TriangleMesh(const indexed_triangle_set &M);
-    void clear() { this->stl.clear(); this->its.clear(); this->repaired = false; }
-    bool ReadSTLFile(const char* input_file) { return stl_open(&stl, input_file); }
-    bool write_ascii(const char* output_file) { return stl_write_ascii(&this->stl, output_file, ""); }
-    bool write_binary(const char* output_file) { return stl_write_binary(&this->stl, output_file, ""); }
-    void repair(bool update_shared_vertices = true);
+    explicit TriangleMesh(indexed_triangle_set &&M, const RepairedMeshErrors& repaired_errors = RepairedMeshErrors());
+    void clear() { this->its.clear(); this->m_stats.clear(); }
+    bool ReadSTLFile(const char* input_file, bool repair = true);
+    bool write_ascii(const char* output_file);
+    bool write_binary(const char* output_file);
     float volume();
-    void check_topology();
-    bool is_manifold() const { return this->stl.stats.connected_facets_3_edge == (int)this->stl.stats.number_of_facets; }
     void WriteOBJFile(const char* output_file) const;
     void scale(float factor);
-    void scale(const Vec3d &versor);
+    void scale(const Vec3f &versor);
     void translate(float x, float y, float z);
     void translate(const Vec3f &displacement);
     void rotate(float angle, const Axis &axis);
@@ -41,51 +107,52 @@ public:
     void rotate_x(float angle) { this->rotate(angle, X); }
     void rotate_y(float angle) { this->rotate(angle, Y); }
     void rotate_z(float angle) { this->rotate(angle, Z); }
-    void mirror(const Axis &axis);
+    void mirror(const Axis axis);
     void mirror_x() { this->mirror(X); }
     void mirror_y() { this->mirror(Y); }
     void mirror_z() { this->mirror(Z); }
     void transform(const Transform3d& t, bool fix_left_handed = false);
     void transform(const Matrix3d& t, bool fix_left_handed = false);
+    // Flip triangles, negate volume.
+    void flip_triangles();
     void align_to_origin();
     void rotate(double angle, Point* center);
-    TriangleMeshPtrs split() const;
+    std::vector<TriangleMesh> split() const;
     void merge(const TriangleMesh &mesh);
     ExPolygons horizontal_projection() const;
-    const float* first_vertex() const { return this->stl.facet_start.empty() ? nullptr : &this->stl.facet_start.front().vertex[0](0); }
     // 2D convex hull of a 3D mesh projected into the Z=0 plane.
     Polygon convex_hull();
     BoundingBoxf3 bounding_box() const;
     // Returns the bbox of this TriangleMesh transformed by the given transformation
     BoundingBoxf3 transformed_bounding_box(const Transform3d &trafo) const;
     // Return the size of the mesh in coordinates.
-    Vec3d size() const { return stl.stats.size.cast<double>(); }
+    Vec3d size() const { return m_stats.size.cast<double>(); }
     /// Return the center of the related bounding box.
     Vec3d center() const { return this->bounding_box().center(); }
     // Returns the convex hull of this TriangleMesh
     TriangleMesh convex_hull_3d() const;
     // Slice this mesh at the provided Z levels and return the vector
     std::vector<ExPolygons> slice(const std::vector<double>& z) const;
-    void reset_repair_stats();
-    bool needed_repair() const;
-    void require_shared_vertices();
-    bool   has_shared_vertices() const { return ! this->its.vertices.empty(); }
-    size_t facets_count() const { return this->stl.stats.number_of_facets; }
+    size_t facets_count() const { assert(m_stats.number_of_facets == this->its.indices.size()); return m_stats.number_of_facets; }
     bool   empty() const { return this->facets_count() == 0; }
-    bool is_splittable() const;
+    bool   repaired() const;
+    bool   is_splittable() const;
     // Estimate of the memory occupied by this structure, important for keeping an eye on the Undo / Redo stack allocation.
     size_t memsize() const;
-    // Release optional data from the mesh if the object is on the Undo / Redo stack only. Returns the amount of memory released.
-    size_t release_optional();
-    // Restore optional data possibly released by release_optional().
-    void restore_optional();
 
-    stl_file stl;
+    // Used by the Undo / Redo stack, legacy interface. As of now there is nothing cached at TriangleMesh,
+    // but we may decide to cache some data in the future (for example normals), thus we keep the interface in place.
+    // Release optional data from the mesh if the object is on the Undo / Redo stack only. Returns the amount of memory released.
+    size_t release_optional() { return 0; }
+    // Restore optional data possibly released by release_optional().
+    void   restore_optional() {}
+
+    const TriangleMeshStats& stats() const { return m_stats; }
+    
     indexed_triangle_set its;
-    bool repaired;
 
 private:
-    std::deque<uint32_t> find_unvisited_neighbors(std::vector<unsigned char> &facet_visited) const;
+    TriangleMeshStats m_stats;
 };
 
 // Index of face indices incident with a vertex index.
@@ -145,8 +212,18 @@ bool its_store_triangle(const indexed_triangle_set &its, const char *obj_filenam
 bool its_store_triangles(const indexed_triangle_set &its, const char *obj_filename, const std::vector<size_t>& triangles);
 
 std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its);
+std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its, std::vector<Vec3i> &face_neighbors);
 
+// Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices).
+bool its_number_of_patches(const indexed_triangle_set &its);
+bool its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors);
+// Same as its_number_of_patches(its) > 1, but faster.
 bool its_is_splittable(const indexed_triangle_set &its);
+bool its_is_splittable(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors);
+
+// Calculate number of unconnected face edges. There should be no unconnected edge in a manifold mesh.
+size_t its_num_open_edges(const indexed_triangle_set &its);
+size_t its_num_open_edges(const std::vector<Vec3i> &face_neighbors);
 
 // Shrink the vectors of its.vertices and its.faces to a minimum size by reallocating the two vectors.
 void its_shrink_to_fit(indexed_triangle_set &its);
@@ -205,16 +282,32 @@ void its_merge(indexed_triangle_set &A, const indexed_triangle_set &B);
 void its_merge(indexed_triangle_set &A, const std::vector<Vec3f> &triangles);
 void its_merge(indexed_triangle_set &A, const Pointf3s &triangles);
 
-indexed_triangle_set its_make_cube(double x, double y, double z);
-TriangleMesh make_cube(double x, double y, double z);
+std::vector<Vec3f> its_face_normals(const indexed_triangle_set &its);
+inline Vec3f face_normal(const stl_vertex vertex[3]) { return  (vertex[1] - vertex[0]).cross(vertex[2] - vertex[1]).normalized(); }
+inline Vec3f face_normal_normalized(const stl_vertex vertex[3]) { return  face_normal(vertex).normalized(); }
+inline Vec3f its_face_normal(const indexed_triangle_set &its, const stl_triangle_vertex_indices face)
+    { const stl_vertex vertices[3] { its.vertices[face[0]], its.vertices[face[1]], its.vertices[face[2]] }; return face_normal_normalized(vertices); }
+inline Vec3f its_face_normal(const indexed_triangle_set &its, const int face_idx)
+    { return its_face_normal(its, its.indices[face_idx]); }
 
-// Generate a TriangleMesh of a cylinder
-indexed_triangle_set its_make_cylinder(double r, double h, double fa=(2*PI/360));
-TriangleMesh make_cylinder(double r, double h, double fa=(2*PI/360));
+indexed_triangle_set    its_make_cube(double x, double y, double z);
+indexed_triangle_set    its_make_prism(float width, float length, float height);
+indexed_triangle_set    its_make_cylinder(double r, double h, double fa=(2*PI/360));
+indexed_triangle_set    its_make_cone(double r, double h, double fa=(2*PI/360));
+indexed_triangle_set    its_make_pyramid(float base, float height);
+indexed_triangle_set    its_make_sphere(double radius, double fa);
 
-indexed_triangle_set its_make_sphere(double rho, double fa=(2*PI/360));
-TriangleMesh make_cone(double r, double h, double fa=(2*PI/360));
-TriangleMesh make_sphere(double rho, double fa=(2*PI/360));
+inline TriangleMesh     make_cube(double x, double y, double z)                 { return TriangleMesh(its_make_cube(x, y, z)); }
+inline TriangleMesh     make_prism(float width, float length, float height)     { return TriangleMesh(its_make_prism(width, length, height)); }
+inline TriangleMesh     make_cylinder(double r, double h, double fa=(2*PI/360)) { return TriangleMesh{its_make_cylinder(r, h, fa)}; }
+inline TriangleMesh     make_cone(double r, double h, double fa=(2*PI/360))     { return TriangleMesh(its_make_cone(r, h, fa)); }
+inline TriangleMesh     make_pyramid(float base, float height)                  { return TriangleMesh(its_make_pyramid(base, height)); }
+inline TriangleMesh     make_sphere(double rho, double fa=(2*PI/360))           { return TriangleMesh(its_make_sphere(rho, fa)); }
+
+bool        its_write_stl_ascii(const char *file, const char *label, const std::vector<stl_triangle_vertex_indices> &indices, const std::vector<stl_vertex> &vertices);
+inline bool its_write_stl_ascii(const char *file, const char *label, const indexed_triangle_set &its) { return its_write_stl_ascii(file, label, its.indices, its.vertices); }
+bool        its_write_stl_binary(const char *file, const char *label, const std::vector<stl_triangle_vertex_indices> &indices, const std::vector<stl_vertex> &vertices);
+inline bool its_write_stl_binary(const char *file, const char *label, const indexed_triangle_set &its) { return its_write_stl_binary(file, label, its.indices, its.vertices); }
 
 inline BoundingBoxf3 bounding_box(const TriangleMesh &m) { return m.bounding_box(); }
 inline BoundingBoxf3 bounding_box(const indexed_triangle_set& its)
@@ -239,18 +332,12 @@ inline BoundingBoxf3 bounding_box(const indexed_triangle_set& its)
 namespace cereal {
     template <class Archive> struct specialize<Archive, Slic3r::TriangleMesh, cereal::specialization::non_member_load_save> {};
     template<class Archive> void load(Archive &archive, Slic3r::TriangleMesh &mesh) {
-        stl_file &stl = mesh.stl;
-        stl.stats.type = inmemory;
-        archive(stl.stats.number_of_facets, stl.stats.original_num_facets);
-        stl_allocate(&stl);
-        archive.loadBinary((char*)stl.facet_start.data(), stl.facet_start.size() * 50);
-        stl_get_size(&stl);
-        mesh.repair();
+        archive.loadBinary(reinterpret_cast<char*>(const_cast<Slic3r::TriangleMeshStats*>(&mesh.stats())), sizeof(Slic3r::TriangleMeshStats));
+        archive(mesh.its.indices, mesh.its.vertices);
     }
     template<class Archive> void save(Archive &archive, const Slic3r::TriangleMesh &mesh) {
-        const stl_file& stl = mesh.stl;
-        archive(stl.stats.number_of_facets, stl.stats.original_num_facets);
-        archive.saveBinary((char*)stl.facet_start.data(), stl.facet_start.size() * 50);
+        archive.saveBinary(reinterpret_cast<const char*>(&mesh.stats()), sizeof(Slic3r::TriangleMeshStats));
+        archive(mesh.its.indices, mesh.its.vertices);
     }
 }
 
diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp
index aa2763968..d3c9a49b5 100644
--- a/src/libslic3r/TriangleMeshSlicer.cpp
+++ b/src/libslic3r/TriangleMeshSlicer.cpp
@@ -1967,7 +1967,8 @@ static void triangulate_slice(
     int                      num_original_vertices,
     // Z height of the slice.
     float                    z, 
-    bool                     triangulate)
+    bool                     triangulate, 
+    bool                     normals_down)
 {
     sort_remove_duplicates(slice_vertices);
 
@@ -1988,7 +1989,7 @@ static void triangulate_slice(
         std::vector<int> map_duplicate_vertex(int(its.vertices.size()) - num_original_vertices, -1);
         int i = 0;
         int k = 0;
-        for (; i < int(map_vertex_to_index.size()); ++ i) {
+        for (; i < int(map_vertex_to_index.size());) {
             map_vertex_to_index[k ++] = map_vertex_to_index[i];
             const Vec2f &ipos = map_vertex_to_index[i].first;
             const int    iidx = map_vertex_to_index[i].second;
@@ -2003,6 +2004,7 @@ static void triangulate_slice(
                     // map to the first vertex
                     map_duplicate_vertex[jidx - num_original_vertices] = iidx;
             }
+            i = j;
         }
         map_vertex_to_index.erase(map_vertex_to_index.begin() + k, map_vertex_to_index.end());
         for (stl_triangle_vertex_indices &f : its.indices)
@@ -2013,7 +2015,7 @@ static void triangulate_slice(
 
     if (triangulate) {
         size_t idx_vertex_new_first = its.vertices.size();
-        Pointf3s triangles = triangulate_expolygons_3d(make_expolygons_simple(lines), z, true);
+        Pointf3s triangles = triangulate_expolygons_3d(make_expolygons_simple(lines), z, normals_down);
         for (size_t i = 0; i < triangles.size(); ) {
             stl_triangle_vertex_indices facet;
             for (size_t j = 0; j < 3; ++ j) {
@@ -2049,6 +2051,33 @@ static void triangulate_slice(
     // its_remove_degenerate_faces(its);
 }
 
+void project_mesh(
+    const indexed_triangle_set       &mesh,
+    const Transform3d                &trafo,
+    Polygons                         *out_top,
+    Polygons                         *out_bottom,
+    std::function<void()>             throw_on_cancel)
+{
+    std::vector<Polygons> top, bottom;
+    std::vector<float>    zs { -1e10, 1e10 };
+    slice_mesh_slabs(mesh, zs, trafo, out_top ? &top : nullptr, out_bottom ? &bottom : nullptr, throw_on_cancel);
+    if (out_top)
+        *out_top = std::move(top.front());
+    if (out_bottom)
+        *out_bottom = std::move(bottom.back());
+}
+
+Polygons project_mesh(
+    const indexed_triangle_set       &mesh,
+    const Transform3d                &trafo,
+    std::function<void()>             throw_on_cancel)
+{
+    std::vector<Polygons> top, bottom;
+    std::vector<float>    zs { -1e10, 1e10 };
+    slice_mesh_slabs(mesh, zs, trafo, &top, &bottom, throw_on_cancel);
+    return union_(top.front(), bottom.back());
+}
+
 void cut_mesh(const indexed_triangle_set &mesh, float z, indexed_triangle_set *upper, indexed_triangle_set *lower, bool triangulate_caps)
 {
     assert(upper || lower);
@@ -2069,6 +2098,10 @@ void cut_mesh(const indexed_triangle_set &mesh, float z, indexed_triangle_set *u
         lower->indices.reserve(mesh.indices.size());
     }
 
+#ifndef NDEBUG
+    size_t num_open_edges_old = triangulate_caps ? its_num_open_edges(mesh) : 0;
+#endif // NDEBUG
+
     // To triangulate the caps after slicing.
     IntersectionLines  upper_lines, lower_lines;
     std::vector<int>   upper_slice_vertices, lower_slice_vertices;
@@ -2135,13 +2168,14 @@ void cut_mesh(const indexed_triangle_set &mesh, float z, indexed_triangle_set *u
             // get vertices starting from the isolated one
             int iv = isolated_vertex;
             stl_vertex v0v1, v2v0;
-            assert(facets_edge_ids[facet_idx](iv) == line.edge_a_id ||facets_edge_ids[facet_idx](iv) == line.edge_b_id);
+            assert(facets_edge_ids[facet_idx](iv) == line.edge_a_id || facets_edge_ids[facet_idx](iv) == line.edge_b_id);
             if (facets_edge_ids[facet_idx](iv) == line.edge_a_id) {
-                v0v1 = to_3d(unscaled<float>(line.a), z);
-                v2v0 = to_3d(unscaled<float>(line.b), z);
+                // Unscale to doubles first, then to floats to reach the same accuracy as triangulate_expolygons_2d().
+                v0v1 = to_3d(unscaled<double>(line.a).cast<float>().eval(), z);
+                v2v0 = to_3d(unscaled<double>(line.b).cast<float>().eval(), z);
             } else {
-                v0v1 = to_3d(unscaled<float>(line.b), z);
-                v2v0 = to_3d(unscaled<float>(line.a), z);
+                v0v1 = to_3d(unscaled<double>(line.b).cast<float>().eval(), z);
+                v2v0 = to_3d(unscaled<double>(line.a).cast<float>().eval(), z);
             }
             const stl_vertex &v0  = vertices[iv];
             const int         iv0 = facet[iv];
@@ -2195,11 +2229,25 @@ void cut_mesh(const indexed_triangle_set &mesh, float z, indexed_triangle_set *u
         }
     }
     
-    if (upper != nullptr)
-        triangulate_slice(*upper, upper_lines, upper_slice_vertices, int(mesh.vertices.size()), z, triangulate_caps);
+    if (upper != nullptr) {
+        triangulate_slice(*upper, upper_lines, upper_slice_vertices, int(mesh.vertices.size()), z, triangulate_caps, NORMALS_DOWN);
+#ifndef NDEBUG
+        if (triangulate_caps) {
+            size_t num_open_edges_new = its_num_open_edges(*upper);
+            assert(num_open_edges_new <= num_open_edges_old);
+        }
+#endif // NDEBUG
+    }
 
-    if (lower != nullptr)
-        triangulate_slice(*lower, lower_lines, lower_slice_vertices, int(mesh.vertices.size()), z, triangulate_caps);
+    if (lower != nullptr) {
+        triangulate_slice(*lower, lower_lines, lower_slice_vertices, int(mesh.vertices.size()), z, triangulate_caps, NORMALS_UP);
+#ifndef NDEBUG
+        if (triangulate_caps) {
+            size_t num_open_edges_new = its_num_open_edges(*lower);
+            assert(num_open_edges_new <= num_open_edges_old);
+        }
+#endif // NDEBUG
+    }
 }
 
-}
+} // namespace Slic3r
diff --git a/src/libslic3r/TriangleMeshSlicer.hpp b/src/libslic3r/TriangleMeshSlicer.hpp
index 7ea7ac3a9..5e08b58e7 100644
--- a/src/libslic3r/TriangleMeshSlicer.hpp
+++ b/src/libslic3r/TriangleMeshSlicer.hpp
@@ -98,7 +98,21 @@ void slice_mesh_slabs(
     std::vector<Polygons>            *out_bottom,
     std::function<void()>             throw_on_cancel);
 
-void                            cut_mesh(
+// Project mesh upwards pointing surfaces / downwards pointing surfaces into 2D polygons.
+void project_mesh(
+    const indexed_triangle_set       &mesh,
+    const Transform3d                &trafo,
+    Polygons                         *out_top,
+    Polygons                         *out_bottom,
+    std::function<void()>             throw_on_cancel);
+
+// Project mesh into 2D polygons.
+Polygons project_mesh(
+    const indexed_triangle_set       &mesh,
+    const Transform3d                &trafo,
+    std::function<void()>             throw_on_cancel);
+
+void cut_mesh(
     const indexed_triangle_set      &mesh,
     float                            z,
     indexed_triangle_set            *upper,
diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp
index 6178bcec8..987ef1c0a 100644
--- a/src/libslic3r/TriangleSelector.cpp
+++ b/src/libslic3r/TriangleSelector.cpp
@@ -9,16 +9,6 @@
 
 namespace Slic3r {
 
-static inline Vec3i root_neighbors(const TriangleMesh &mesh, int triangle_id)
-{
-    Vec3i neighbors;
-    const stl_neighbors& neighbors_src = mesh.stl.neighbors_start[triangle_id];
-    for (int i = 0; i < 3; ++i)
-        // Refuse a neighbor with a flipped normal.
-        neighbors(i) = neighbors_src.neighbor[i];
-    return neighbors;
-}
-
 #ifndef NDEBUG
 bool TriangleSelector::verify_triangle_midpoints(const Triangle &tr) const
 {
@@ -129,7 +119,7 @@ int TriangleSelector::select_unsplit_triangle(const Vec3f &hit, int facet_idx) c
     if (!m_triangles[facet_idx].valid())
         return -1;
 
-    Vec3i neighbors = root_neighbors(*m_mesh, facet_idx);
+    Vec3i neighbors = m_neighbors[facet_idx];
     assert(this->verify_triangle_neighbors(m_triangles[facet_idx], neighbors));
     return this->select_unsplit_triangle(hit, facet_idx, neighbors);
 }
@@ -167,7 +157,7 @@ void TriangleSelector::select_patch(const Vec3f& hit, int facet_start,
         if (! visited[facet]) {
             if (select_triangle(facet, new_state, triangle_splitting)) {
                 // add neighboring facets to list to be proccessed later
-                for (int neighbor_idx : m_mesh->stl.neighbors_start[facet].neighbor) {
+                for (int neighbor_idx : m_neighbors[facet]) {
                     if (neighbor_idx >=0 && (m_cursor.type == SPHERE || faces_camera(neighbor_idx)))
                         facets_to_check.push_back(neighbor_idx);
                 }
@@ -213,12 +203,12 @@ void TriangleSelector::seed_fill_select_triangles(const Vec3f &hit, int facet_st
 
             if (current_facet < m_orig_size_indices)
                 // Propagate over the original triangles.
-                for (int neighbor_idx : m_mesh->stl.neighbors_start[current_facet].neighbor) {
+                for (int neighbor_idx : m_neighbors[current_facet]) {
                     assert(neighbor_idx >= -1);
                     if (neighbor_idx >= 0 && !visited[neighbor_idx]) {
                         // Check if neighbour_facet_idx is satisfies angle in seed_fill_angle and append it to facet_queue if it do.
-                        const Vec3f &n1 = m_mesh->stl.facet_start[m_triangles[neighbor_idx].source_triangle].normal;
-                        const Vec3f &n2 = m_mesh->stl.facet_start[m_triangles[current_facet].source_triangle].normal;
+                        const Vec3f &n1 = m_face_normals[m_triangles[neighbor_idx].source_triangle];
+                        const Vec3f &n2 = m_face_normals[m_triangles[current_facet].source_triangle];
                         if (std::clamp(n1.dot(n2), 0.f, 1.f) >= facet_angle_limit)
                             facet_queue.push(neighbor_idx);
                     }
@@ -261,7 +251,7 @@ std::pair<std::vector<Vec3i>, std::vector<Vec3i>> TriangleSelector::precompute_a
     std::vector<Vec3i> neighbors(m_triangles.size(), Vec3i(-1, -1, -1));
     std::vector<Vec3i> neighbors_propagated(m_triangles.size(), Vec3i(-1, -1, -1));
     for (int facet_idx = 0; facet_idx < this->m_orig_size_indices; ++facet_idx) {
-        neighbors[facet_idx]            = root_neighbors(*m_mesh, facet_idx);
+        neighbors[facet_idx]            = m_neighbors[facet_idx];
         neighbors_propagated[facet_idx] = neighbors[facet_idx];
         assert(this->verify_triangle_neighbors(m_triangles[facet_idx], neighbors[facet_idx]));
         if (m_triangles[facet_idx].is_split())
@@ -403,7 +393,7 @@ bool TriangleSelector::select_triangle(int facet_idx, EnforcerBlockerType type,
     if (! m_triangles[facet_idx].valid())
         return false;
 
-    Vec3i neighbors = root_neighbors(*m_mesh, facet_idx);
+    Vec3i neighbors = m_neighbors[facet_idx];
     assert(this->verify_triangle_neighbors(m_triangles[facet_idx], neighbors));
 
     if (! select_triangle_recursive(facet_idx, neighbors, type, triangle_splitting))
@@ -906,14 +896,10 @@ bool TriangleSelector::is_pointer_in_triangle(int facet_idx) const
 bool TriangleSelector::faces_camera(int facet) const
 {
     assert(facet < m_orig_size_indices);
-    // The normal is cached in mesh->stl, use it.
-    Vec3f normal = m_mesh->stl.facet_start[facet].normal;
-
-    if (! m_cursor.uniform_scaling) {
-        // Transform the normal into world coords.
-        normal = m_cursor.trafo_normal * normal;
-    }
-    return (normal.dot(m_cursor.dir) < 0.);
+    Vec3f n = m_face_normals[facet];
+    if (! m_cursor.uniform_scaling)
+        n = m_cursor.trafo_normal * n;
+    return n.dot(m_cursor.dir) < 0.;
 }
 
 
@@ -1094,7 +1080,7 @@ void TriangleSelector::garbage_collect()
 }
 
 TriangleSelector::TriangleSelector(const TriangleMesh& mesh)
-    : m_mesh{&mesh}
+    : m_mesh{mesh}, m_neighbors(its_face_neighbors(mesh.its)), m_face_normals(its_face_normals(mesh.its))
 {
     reset();
 }
@@ -1107,16 +1093,17 @@ void TriangleSelector::reset()
     m_invalid_triangles = 0;
     m_free_triangles_head = -1;
     m_free_vertices_head = -1;
-    m_vertices.reserve(m_mesh->its.vertices.size());
-    for (const stl_vertex& vert : m_mesh->its.vertices)
+    m_vertices.reserve(m_mesh.its.vertices.size());
+    for (const stl_vertex& vert : m_mesh.its.vertices)
         m_vertices.emplace_back(vert);
-    m_triangles.reserve(m_mesh->its.indices.size());
-    for (size_t i = 0; i < m_mesh->its.indices.size(); ++i) {
-        const stl_triangle_vertex_indices &ind = m_mesh->its.indices[i];
+    m_triangles.reserve(m_mesh.its.indices.size());
+    for (size_t i = 0; i < m_mesh.its.indices.size(); ++i) {
+        const stl_triangle_vertex_indices &ind = m_mesh.its.indices[i];
         push_triangle(ind[0], ind[1], ind[2], int(i));
     }
     m_orig_size_vertices = int(m_vertices.size());
     m_orig_size_indices  = int(m_triangles.size());
+
 }
 
 
@@ -1286,7 +1273,7 @@ indexed_triangle_set TriangleSelector::get_facets_strict(EnforcerBlockerType sta
         }
 
     for (int itriangle = 0; itriangle < m_orig_size_indices; ++ itriangle)
-        this->get_facets_strict_recursive(m_triangles[itriangle], root_neighbors(*m_mesh, itriangle), state, out.indices);
+        this->get_facets_strict_recursive(m_triangles[itriangle], m_neighbors[itriangle], state, out.indices);
 
     for (auto &triangle : out.indices)
         for (int i = 0; i < 3; ++ i)
@@ -1398,7 +1385,7 @@ void TriangleSelector::get_facets_split_by_tjoints(const Vec3i &vertices, const
 std::vector<Vec2i> TriangleSelector::get_seed_fill_contour() const {
     std::vector<Vec2i> edges_out;
     for (int facet_idx = 0; facet_idx < this->m_orig_size_indices; ++facet_idx) {
-        const Vec3i neighbors = root_neighbors(*m_mesh, facet_idx);
+        const Vec3i neighbors = m_neighbors[facet_idx];
         assert(this->verify_triangle_neighbors(m_triangles[facet_idx], neighbors));
         this->get_seed_fill_contour_recursive(facet_idx, neighbors, neighbors, edges_out);
     }
@@ -1522,10 +1509,10 @@ void TriangleSelector::deserialize(const std::pair<std::vector<std::pair<int, in
 
     // Reserve number of triangles as if each triangle was saved with 4 bits.
     // With MMU painting this estimate may be somehow low, but better than nothing.
-    m_triangles.reserve(std::max(m_mesh->its.indices.size(), data.second.size() / 4));
+    m_triangles.reserve(std::max(m_mesh.its.indices.size(), data.second.size() / 4));
     // Number of triangles is twice the number of vertices on a large manifold mesh of genus zero.
     // Here the triangles count account for both the nodes and leaves, thus the following line may overestimate.
-    m_vertices.reserve(std::max(m_mesh->its.vertices.size(), m_triangles.size() / 2));
+    m_vertices.reserve(std::max(m_mesh.its.vertices.size(), m_triangles.size() / 2));
 
     // Vector to store all parents that have offsprings.
     struct ProcessingInfo {
@@ -1565,7 +1552,7 @@ void TriangleSelector::deserialize(const std::pair<std::vector<std::pair<int, in
                 if (is_split) {
                     // root is split, add it into list of parents and split it.
                     // then go to the next.
-                    Vec3i neighbors = root_neighbors(*m_mesh, triangle_id);
+                    Vec3i neighbors = m_neighbors[triangle_id];
                     parents.push_back({triangle_id, neighbors, 0, num_of_children});
                     m_triangles[triangle_id].set_division(num_of_split_sides, special_side);
                     perform_split(triangle_id, neighbors, EnforcerBlockerType::NONE);
diff --git a/src/libslic3r/TriangleSelector.hpp b/src/libslic3r/TriangleSelector.hpp
index 2ab053123..05a78e2ee 100644
--- a/src/libslic3r/TriangleSelector.hpp
+++ b/src/libslic3r/TriangleSelector.hpp
@@ -161,7 +161,9 @@ protected:
     // Lists of vertices and triangles, both original and new
     std::vector<Vertex> m_vertices;
     std::vector<Triangle> m_triangles;
-    const TriangleMesh* m_mesh;
+    const TriangleMesh &m_mesh;
+    const std::vector<Vec3i> m_neighbors;
+    const std::vector<Vec3f> m_face_normals;
 
     // Number of invalid triangles (to trigger garbage collection).
     int m_invalid_triangles;
diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index a01e63166..cfb4cfa92 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -255,6 +255,19 @@ template<typename T> struct IsTriviallyCopyable { static constexpr bool value =
 template<typename T> struct IsTriviallyCopyable : public std::is_trivially_copyable<T> {};
 #endif
 
+// A very lightweight ROII wrapper around C FILE.
+// The old C file API is much faster than C++ streams, thus they are recommended for processing large / huge files.
+struct FilePtr {
+    FilePtr(FILE *f) : f(f) {}
+    ~FilePtr() { this->close(); }
+    void close() { 
+        if (this->f) {
+            ::fclose(this->f);
+            this->f = nullptr;
+        }
+    }
+    FILE* f = nullptr;
+};
 
 class ScopeGuard
 {
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 50ac64aa4..f73eb5c8f 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -889,7 +889,7 @@ std::string string_printf(const char *format, ...)
 
 std::string header_slic3r_generated()
 {
-	return std::string("generated by " SLIC3R_APP_NAME " " SLIC3R_VERSION " on " ) + Utils::utc_timestamp();
+	return std::string("generated by PrusaSlicer " SLIC3R_VERSION " on " ) + Utils::utc_timestamp();
 }
 
 std::string header_gcodeviewer_generated()
@@ -906,6 +906,7 @@ unsigned get_current_pid()
 #endif
 }
 
+//FIXME this has potentially O(n^2) time complexity!
 std::string xml_escape(std::string text, bool is_marked/* = false*/)
 {
     std::string::size_type pos = 0;
diff --git a/src/platform/msw/PrusaSlicer-gcodeviewer.rc.in b/src/platform/msw/PrusaSlicer-gcodeviewer.rc.in
index eed737cb7..518f6b7b6 100644
--- a/src/platform/msw/PrusaSlicer-gcodeviewer.rc.in
+++ b/src/platform/msw/PrusaSlicer-gcodeviewer.rc.in
@@ -12,7 +12,7 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@
    VALUE "ProductName", "@SLIC3R_APP_NAME@ G-code Viewer"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
    VALUE "InternalName", "@SLIC3R_APP_NAME@ G-code Viewer"
-   VALUE "LegalCopyright", "Copyright \251 2016-2020 Prusa Research, \251 2011-2018 Alessandro Ranellucci"
+   VALUE "LegalCopyright", "Copyright \251 2016-2021 Prusa Research, \251 2011-2018 Alessandro Ranellucci"
    VALUE "OriginalFilename", "prusa-gcodeviewer.exe"
   }
  }
diff --git a/src/platform/msw/PrusaSlicer.rc.in b/src/platform/msw/PrusaSlicer.rc.in
index a4520c6d7..d7f860204 100644
--- a/src/platform/msw/PrusaSlicer.rc.in
+++ b/src/platform/msw/PrusaSlicer.rc.in
@@ -12,7 +12,7 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@
    VALUE "ProductName", "@SLIC3R_APP_NAME@"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
    VALUE "InternalName", "@SLIC3R_APP_NAME@"
-   VALUE "LegalCopyright", "Copyright \251 2016-2020 Prusa Research, \251 2011-2018 Alessandro Ranellucci"
+   VALUE "LegalCopyright", "Copyright \251 2016-2021 Prusa Research, \251 2011-2018 Alessandro Ranellucci"
    VALUE "OriginalFilename", "prusa-slicer.exe"
   }
  }
diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in
index 46858bb29..f1de1d24b 100644
--- a/src/platform/osx/Info.plist.in
+++ b/src/platform/osx/Info.plist.in
@@ -5,7 +5,7 @@
   <key>CFBundleExecutable</key>
   <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleGetInfoString</key>
-  <string>@SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2020 Prusa Reseach</string>
+  <string>@SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2021 Prusa Reseach</string>
   <key>CFBundleIconFile</key>
   <string>PrusaSlicer.icns</string>
   <key>CFBundleName</key>
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index f95930701..a0a6eeb79 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -143,6 +143,8 @@ set(SLIC3R_GUI_SOURCES
     GUI/RammingChart.hpp
     GUI/RemovableDriveManager.cpp
     GUI/RemovableDriveManager.hpp
+    GUI/SendSystemInfoDialog.cpp
+    GUI/SendSystemInfoDialog.hpp
     GUI/BonjourDialog.cpp
     GUI/BonjourDialog.hpp
     GUI/ButtonsDescription.cpp
@@ -181,6 +183,8 @@ set(SLIC3R_GUI_SOURCES
     GUI/Jobs/SLAImportJob.hpp
     GUI/Jobs/SLAImportJob.cpp
     GUI/Jobs/ProgressIndicator.hpp
+    GUI/Jobs/NotificationProgressIndicator.hpp
+    GUI/Jobs/NotificationProgressIndicator.cpp
     GUI/ProgressStatusBar.hpp
     GUI/ProgressStatusBar.cpp
     GUI/Mouse3DController.cpp
diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp
index e184b43fc..e7c2cbe54 100644
--- a/src/slic3r/GUI/2DBed.cpp
+++ b/src/slic3r/GUI/2DBed.cpp
@@ -92,7 +92,7 @@ void Bed_2D::repaint(const std::vector<Vec2d>& shape)
 	for (auto y = bb.min(1) - fmod(bb.min(1), step) + step; y < bb.max(1); y += step) {
 		polylines.push_back(Polyline::new_scale({ Vec2d(bb.min(0), y), Vec2d(bb.max(0), y) }));
 	}
-	polylines = intersection_pl(polylines, (Polygons)bed_polygon);
+	polylines = intersection_pl(polylines, bed_polygon);
 
     dc.SetPen(wxPen(wxColour(230, 230, 230), 1, wxPENSTYLE_SOLID));
 	for (auto pl : polylines)
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index 4dd4eb5df..fd2e529d3 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -9,9 +9,7 @@
 #include "3DScene.hpp"
 #include "GLShader.hpp"
 #include "GUI_App.hpp"
-#if ENABLE_ENVIRONMENT_MAP || ENABLE_SINKING_CONTOURS
 #include "Plater.hpp"
-#endif // ENABLE_ENVIRONMENT_MAP || ENABLE_SINKING_CONTOURS
 
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/ExtrusionEntityCollection.hpp"
@@ -25,9 +23,7 @@
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/ClipperUtils.hpp"
-#if ENABLE_SINKING_CONTOURS
 #include "libslic3r/Tesselate.hpp"
-#endif // ENABLE_SINKING_CONTOURS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -158,22 +154,27 @@ void GLIndexedVertexArray::load_mesh_full_shading(const TriangleMesh& mesh)
     }
     else {
 #endif // ENABLE_SMOOTH_NORMALS
-        this->vertices_and_normals_interleaved.reserve(this->vertices_and_normals_interleaved.size() + 3 * 3 * 2 * mesh.facets_count());
-
-        unsigned int vertices_count = 0;
-        for (int i = 0; i < (int)mesh.stl.stats.number_of_facets; ++i) {
-            const stl_facet& facet = mesh.stl.facet_start[i];
-            for (int j = 0; j < 3; ++j)
-                this->push_geometry(facet.vertex[j](0), facet.vertex[j](1), facet.vertex[j](2), facet.normal(0), facet.normal(1), facet.normal(2));
-
-            this->push_triangle(vertices_count, vertices_count + 1, vertices_count + 2);
-            vertices_count += 3;
-        }
+        this->load_its_flat_shading(mesh.its);
 #if ENABLE_SMOOTH_NORMALS
     }
 #endif // ENABLE_SMOOTH_NORMALS
 }
 
+void GLIndexedVertexArray::load_its_flat_shading(const indexed_triangle_set &its)
+{
+    this->vertices_and_normals_interleaved.reserve(this->vertices_and_normals_interleaved.size() + 3 * 3 * 2 * its.indices.size());
+    unsigned int vertices_count = 0;
+    for (int i = 0; i < int(its.indices.size()); ++ i) {
+        stl_triangle_vertex_indices face        = its.indices[i];
+        stl_vertex                  vertex[3]   = { its.vertices[face[0]], its.vertices[face[1]], its.vertices[face[2]] };
+        stl_vertex                  n           = face_normal_normalized(vertex);
+        for (int j = 0; j < 3; ++j)
+            this->push_geometry(vertex[j](0), vertex[j](1), vertex[j](2), n(0), n(1), n(2));
+        this->push_triangle(vertices_count, vertices_count + 1, vertices_count + 2);
+        vertices_count += 3;
+    }
+}
+
 void GLIndexedVertexArray::finalize_geometry(bool opengl_initialized)
 {
     assert(this->vertices_and_normals_interleaved_VBO_id == 0);
@@ -288,7 +289,6 @@ void GLIndexedVertexArray::render(
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 }
 
-#if ENABLE_SINKING_CONTOURS
 const float GLVolume::SinkingContours::HalfWidth = 0.25f;
 
 void GLVolume::SinkingContours::render()
@@ -313,7 +313,6 @@ void GLVolume::SinkingContours::update()
             m_shift = Vec3d::Zero();
 
             const TriangleMesh& mesh = model.objects[object_idx]->volumes[m_parent.volume_idx()]->mesh();
-            assert(mesh.has_shared_vertices());
 
             m_model.reset();
             GUI::GLModel::InitializationData init_data;
@@ -356,7 +355,6 @@ void GLVolume::SinkingContours::update()
     else
         m_model.reset();
 }
-#endif // ENABLE_SINKING_CONTOURS
 
 const std::array<float, 4> GLVolume::SELECTED_COLOR = { 0.0f, 1.0f, 0.0f, 1.0f };
 const std::array<float, 4> GLVolume::HOVER_SELECT_COLOR = { 0.4f, 0.9f, 0.1f, 1.0f };
@@ -375,12 +373,8 @@ const std::array<std::array<float, 4>, 4> GLVolume::MODEL_COLOR = { {
 } };
 
 GLVolume::GLVolume(float r, float g, float b, float a)
-    : m_transformed_bounding_box_dirty(true)
-    , m_sla_shift_z(0.0)
-    , m_transformed_convex_hull_bounding_box_dirty(true)
-#if ENABLE_SINKING_CONTOURS
+    : m_sla_shift_z(0.0)
     , m_sinking_contours(*this)
-#endif // ENABLE_SINKING_CONTOURS
     // geometry_id == 0 -> invalid
     , geometry_id(std::pair<size_t, size_t>(0, 0))
     , extruder_id(0)
@@ -398,9 +392,7 @@ GLVolume::GLVolume(float r, float g, float b, float a)
     , force_transparent(false)
     , force_native_color(false)
     , force_neutral_color(false)
-#if ENABLE_SINKING_CONTOURS
     , force_sinking_contours(false)
-#endif // ENABLE_SINKING_CONTOURS
     , tverts_range(0, size_t(-1))
     , qverts_range(0, size_t(-1))
 {
@@ -505,32 +497,27 @@ bool GLVolume::is_left_handed() const
 
 const BoundingBoxf3& GLVolume::transformed_bounding_box() const
 {
-    const BoundingBoxf3& box = bounding_box();
-    assert(box.defined || box.min(0) >= box.max(0) || box.min(1) >= box.max(1) || box.min(2) >= box.max(2));
-
-    BoundingBoxf3* transformed_bounding_box = const_cast<BoundingBoxf3*>(&m_transformed_bounding_box);
-    bool* transformed_bounding_box_dirty = const_cast<bool*>(&m_transformed_bounding_box_dirty);
-    if (*transformed_bounding_box_dirty) {
-        *transformed_bounding_box = box.transformed(world_matrix());
-        *transformed_bounding_box_dirty = false;
+    if (!m_transformed_bounding_box.has_value()) {
+        const BoundingBoxf3& box = bounding_box();
+        assert(box.defined || box.min.x() >= box.max.x() || box.min.y() >= box.max.y() || box.min.z() >= box.max.z());
+        std::optional<BoundingBoxf3>* trans_box = const_cast<std::optional<BoundingBoxf3>*>(&m_transformed_bounding_box);
+        *trans_box = box.transformed(world_matrix());
     }
-    return *transformed_bounding_box;
+    return *m_transformed_bounding_box;
 }
 
 const BoundingBoxf3& GLVolume::transformed_convex_hull_bounding_box() const
 {
-    BoundingBoxf3* transformed_convex_hull_bounding_box = const_cast<BoundingBoxf3*>(&m_transformed_convex_hull_bounding_box);
-    bool* transformed_convex_hull_bounding_box_dirty = const_cast<bool*>(&m_transformed_convex_hull_bounding_box_dirty);
-    if (*transformed_convex_hull_bounding_box_dirty) {
-        *transformed_convex_hull_bounding_box = this->transformed_convex_hull_bounding_box(world_matrix());
-        *transformed_convex_hull_bounding_box_dirty = false;
+    if (!m_transformed_convex_hull_bounding_box.has_value()) {
+        std::optional<BoundingBoxf3>* trans_box = const_cast<std::optional<BoundingBoxf3>*>(&m_transformed_convex_hull_bounding_box);
+        *trans_box = transformed_convex_hull_bounding_box(world_matrix());
     }
-    return *transformed_convex_hull_bounding_box;
+    return *m_transformed_convex_hull_bounding_box;
 }
 
 BoundingBoxf3 GLVolume::transformed_convex_hull_bounding_box(const Transform3d &trafo) const
 {
-	return (m_convex_hull && m_convex_hull->stl.stats.number_of_facets > 0) ? 
+	return (m_convex_hull && ! m_convex_hull->empty()) ?
 		m_convex_hull->transformed_bounding_box(trafo) :
         bounding_box().transformed(trafo);
 }
@@ -604,12 +591,10 @@ bool GLVolume::is_below_printbed() const
     return transformed_convex_hull_bounding_box().max.z() < 0.0;
 }
 
-#if ENABLE_SINKING_CONTOURS
 void GLVolume::render_sinking_contours()
 {
     m_sinking_contours.render();
 }
-#endif // ENABLE_SINKING_CONTOURS
 
 std::vector<int> GLVolumeCollection::load_object(
     const ModelObject       *model_object,
@@ -732,21 +717,20 @@ int GLVolumeCollection::load_wipe_tower_preview(
         float min_width = 30.f;
         // We'll now create the box with jagged edge. y-coordinates of the pre-generated model
         // are shifted so that the front edge has y=0 and centerline of the back edge has y=depth:
-        Pointf3s points;
-        std::vector<Vec3i> facets;
         float out_points_idx[][3] = { { 0, -depth, 0 }, { 0, 0, 0 }, { 38.453f, 0, 0 }, { 61.547f, 0, 0 }, { 100.0f, 0, 0 }, { 100.0f, -depth, 0 }, { 55.7735f, -10.0f, 0 }, { 44.2265f, 10.0f, 0 },
         { 38.453f, 0, 1 }, { 0, 0, 1 }, { 0, -depth, 1 }, { 100.0f, -depth, 1 }, { 100.0f, 0, 1 }, { 61.547f, 0, 1 }, { 55.7735f, -10.0f, 1 }, { 44.2265f, 10.0f, 1 } };
-        int out_facets_idx[][3] = { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 5, 0 }, { 3, 5, 6 }, { 6, 2, 7 }, { 6, 0, 2 }, { 8, 9, 10 }, { 11, 12, 13 }, { 10, 11, 14 }, { 14, 11, 13 }, { 15, 8, 14 },
-                                   {8, 10, 14}, {3, 12, 4}, {3, 13, 12}, {6, 13, 3}, {6, 14, 13}, {7, 14, 6}, {7, 15, 14}, {2, 15, 7}, {2, 8, 15}, {1, 8, 2}, {1, 9, 8},
-                                   {0, 9, 1}, {0, 10, 9}, {5, 10, 0}, {5, 11, 10}, {4, 11, 5}, {4, 12, 11} };
+        static constexpr const int out_facets_idx[][3] = { 
+            { 0, 1, 2 }, { 3, 4, 5 }, { 6, 5, 0 }, { 3, 5, 6 }, { 6, 2, 7 }, { 6, 0, 2 }, { 8, 9, 10 }, { 11, 12, 13 }, { 10, 11, 14 }, { 14, 11, 13 }, { 15, 8, 14 },
+            { 8, 10, 14 }, { 3, 12, 4 }, { 3, 13, 12 }, { 6, 13, 3 }, { 6, 14, 13 }, { 7, 14, 6 }, { 7, 15, 14 }, { 2, 15, 7 }, { 2, 8, 15 }, { 1, 8, 2 }, { 1, 9, 8 },
+            { 0, 9, 1 }, { 0, 10, 9 }, { 5, 10, 0 }, { 5, 11, 10 }, { 4, 11, 5 }, { 4, 12, 11 } };
+        indexed_triangle_set its;
         for (int i = 0; i < 16; ++i)
-            points.emplace_back(out_points_idx[i][0] / (100.f / min_width),
-                                out_points_idx[i][1] + depth, out_points_idx[i][2]);
-        for (int i = 0; i < 28; ++i)
-            facets.emplace_back(out_facets_idx[i][0],
-                                out_facets_idx[i][1],
-                                out_facets_idx[i][2]);
-        TriangleMesh tooth_mesh(points, facets);
+            its.vertices.emplace_back(out_points_idx[i][0] / (100.f / min_width),
+                                      out_points_idx[i][1] + depth, out_points_idx[i][2]);
+        its.indices.reserve(28);
+        for (const int *face : out_facets_idx)
+            its.indices.emplace_back(face);
+        TriangleMesh tooth_mesh(std::move(its));
 
         // We have the mesh ready. It has one tooth and width of min_width. We will now
         // append several of these together until we are close to the required width
@@ -757,7 +741,7 @@ int GLVolumeCollection::load_wipe_tower_preview(
             tooth_mesh.translate(min_width, 0.f, 0.f);
         }
 
-        mesh.scale(Vec3d(width / (n * min_width), 1.f, height)); // Scaling to proper width
+        mesh.scale(Vec3f(width / (n * min_width), 1.f, height)); // Scaling to proper width
     }
     else
         mesh = make_cube(width, depth, height);
@@ -769,7 +753,7 @@ int GLVolumeCollection::load_wipe_tower_preview(
 
     volumes.emplace_back(new GLVolume(color));
     GLVolume& v = *volumes.back();
-    v.indexed_vertex_array.load_mesh(mesh);
+    v.indexed_vertex_array.load_mesh(mesh);    
     v.indexed_vertex_array.finalize_geometry(opengl_initialized);
     v.set_volume_offset(Vec3d(pos_x, pos_y, 0.0));
     v.set_volume_rotation(Vec3d(0., 0., (M_PI / 180.) * rotation_angle));
@@ -833,11 +817,9 @@ GLVolumeWithIdAndZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCo
 
 void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func) const
 {
-#if ENABLE_SINKING_CONTOURS
     GLVolumeWithIdAndZList to_render = volumes_to_render(volumes, type, view_matrix, filter_func);
     if (to_render.empty())
         return;
-#endif // ENABLE_SINKING_CONTOURS
 
     GLShaderProgram* shader = GUI::wxGetApp().get_current_shader();
     if (shader == nullptr)
@@ -852,7 +834,6 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
     if (disable_cullface)
         glsafe(::glDisable(GL_CULL_FACE));
 
-#if ENABLE_SINKING_CONTOURS
     for (GLVolumeWithIdAndZ& volume : to_render) {
         volume.first->set_render_color();
 
@@ -902,7 +883,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
         glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
     }
 
-    if (m_show_sinking_contours)
+    if (m_show_sinking_contours) {
         for (GLVolumeWithIdAndZ& volume : to_render) {
             // render sinking contours of hovered/displaced volumes
             if (volume.first->is_sinking() && !volume.first->is_below_printbed() &&
@@ -914,48 +895,8 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
                 shader->start_using();
             }
         }
-#else
-    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
-    glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
- 
-    shader->set_uniform("print_box.min", m_print_box_min, 3);
-    shader->set_uniform("print_box.max", m_print_box_max, 3);
-    shader->set_uniform("z_range", m_z_range, 2);
-    shader->set_uniform("clipping_plane", m_clipping_plane, 4);
-    shader->set_uniform("slope.normal_z", m_slope.normal_z);
-
-#if ENABLE_ENVIRONMENT_MAP
-    unsigned int environment_texture_id = GUI::wxGetApp().plater()->get_environment_texture_id();
-    bool use_environment_texture = environment_texture_id > 0 && GUI::wxGetApp().app_config->get("use_environment_map") == "1";
-    shader->set_uniform("use_environment_tex", use_environment_texture);
-    if (use_environment_texture)
-        glsafe(::glBindTexture(GL_TEXTURE_2D, environment_texture_id));
-#endif // ENABLE_ENVIRONMENT_MAP
-    glcheck();
-
-    GLVolumeWithIdAndZList to_render = volumes_to_render(this->volumes, type, view_matrix, filter_func);
-    for (GLVolumeWithIdAndZ& volume : to_render) {
-        volume.first->set_render_color();
-        shader->set_uniform("uniform_color", volume.first->render_color);
-        shader->set_uniform("print_box.actived", volume.first->shader_outside_printer_detection_enabled);
-        shader->set_uniform("print_box.volume_world_matrix", volume.first->world_matrix());
-        shader->set_uniform("slope.actived", m_slope.active && !volume.first->is_modifier && !volume.first->is_wipe_tower);
-        shader->set_uniform("slope.volume_world_normal_matrix", static_cast<Matrix3f>(volume.first->world_matrix().matrix().block(0, 0, 3, 3).inverse().transpose().cast<float>()));
-        volume.first->render();
     }
 
-#if ENABLE_ENVIRONMENT_MAP
-    if (use_environment_texture)
-        glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
-#endif // ENABLE_ENVIRONMENT_MAP
-
-    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
-    glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-
-    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
-    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
-#endif // ENABLE_SINKING_CONTOURS
-
     if (disable_cullface)
         glsafe(::glEnable(GL_CULL_FACE));
 
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp
index 1a85cc41e..78b9a96d9 100644
--- a/src/slic3r/GUI/3DScene.hpp
+++ b/src/slic3r/GUI/3DScene.hpp
@@ -8,11 +8,10 @@
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Geometry.hpp"
 
-#if ENABLE_SINKING_CONTOURS
 #include "GLModel.hpp"
-#endif // ENABLE_SINKING_CONTOURS
 
 #include <functional>
+#include <optional>
 
 #define HAS_GLSAFE
 #ifdef HAS_GLSAFE
@@ -128,6 +127,8 @@ public:
     void load_mesh(const TriangleMesh& mesh) { this->load_mesh_full_shading(mesh); }
 #endif // ENABLE_SMOOTH_NORMALS
 
+    void load_its_flat_shading(const indexed_triangle_set &its);
+
     inline bool has_VBOs() const { return vertices_and_normals_interleaved_VBO_id != 0; }
 
     inline void reserve(size_t sz) {
@@ -258,9 +259,7 @@ public:
     enum EHoverState : unsigned char
     {
         HS_None,
-#if ENABLE_SINKING_CONTOURS
         HS_Hover,
-#endif // ENABLE_SINKING_CONTOURS
         HS_Select,
         HS_Deselect
     };
@@ -275,17 +274,12 @@ private:
     // Shift in z required by sla supports+pad
     double        m_sla_shift_z;
     // Bounding box of this volume, in unscaled coordinates.
-    BoundingBoxf3 m_transformed_bounding_box;
-    // Whether or not is needed to recalculate the transformed bounding box.
-    bool          m_transformed_bounding_box_dirty;
+    std::optional<BoundingBoxf3> m_transformed_bounding_box;
     // Convex hull of the volume, if any.
     std::shared_ptr<const TriangleMesh> m_convex_hull;
     // Bounding box of this volume, in unscaled coordinates.
-    BoundingBoxf3 m_transformed_convex_hull_bounding_box;
-    // Whether or not is needed to recalculate the transformed convex hull bounding box.
-    bool          m_transformed_convex_hull_bounding_box_dirty;
+    std::optional<BoundingBoxf3> m_transformed_convex_hull_bounding_box;
 
-#if ENABLE_SINKING_CONTOURS
     class SinkingContours
     {
         static const float HalfWidth;
@@ -303,7 +297,6 @@ private:
     };
 
     SinkingContours m_sinking_contours;
-#endif // ENABLE_SINKING_CONTOURS
 
 public:
     // Color of the triangles / quads held by this volume.
@@ -365,10 +358,8 @@ public:
 	    bool                force_native_color : 1;
         // Whether or not render this volume in neutral
         bool                force_neutral_color : 1;
-#if ENABLE_SINKING_CONTOURS
         // Whether or not to force rendering of sinking contours
         bool                force_sinking_contours : 1;
-#endif // ENABLE_SINKING_CONTOURS
     };
 
     // Is mouse or rectangle selection over this object to select/deselect it ?
@@ -490,16 +481,14 @@ public:
     void                finalize_geometry(bool opengl_initialized) { this->indexed_vertex_array.finalize_geometry(opengl_initialized); }
     void                release_geometry() { this->indexed_vertex_array.release_geometry(); }
 
-    void                set_bounding_boxes_as_dirty() { m_transformed_bounding_box_dirty = true; m_transformed_convex_hull_bounding_box_dirty = true; }
+    void                set_bounding_boxes_as_dirty() { m_transformed_bounding_box.reset(); m_transformed_convex_hull_bounding_box.reset(); }
 
     bool                is_sla_support() const;
     bool                is_sla_pad() const;
 
     bool                is_sinking() const;
     bool                is_below_printbed() const;
-#if ENABLE_SINKING_CONTOURS
     void                render_sinking_contours();
-#endif // ENABLE_SINKING_CONTOURS
 
     // Return an estimate of the memory consumed by this class.
     size_t 				cpu_memory_used() const { 
diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp
index 2aae9270d..a6b99a08b 100644
--- a/src/slic3r/GUI/AboutDialog.cpp
+++ b/src/slic3r/GUI/AboutDialog.cpp
@@ -275,7 +275,7 @@ AboutDialog::AboutDialog()
             "<html>"
             "<body bgcolor= %1% link= %2%>"
             "<font color=%3%>"
-            "%4% &copy; 2016-2020 Prusa Research. <br />"
+            "%4% &copy; 2016-2021 Prusa Research. <br />"
             "%5% &copy; 2011-2018 Alessandro Ranellucci. <br />"
             "<a href=\"http://slic3r.org/\">Slic3r</a> %6% "
             "<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\">%7%</a>."
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index b4de4a509..e93f32b03 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -209,8 +209,8 @@ void BackgroundSlicingProcess::process_sla()
 
 void BackgroundSlicingProcess::thread_proc()
 {
-    set_current_thread_name("slic3r_BgSlcPcs");
-	name_tbb_thread_pool_threads();
+	set_current_thread_name("slic3r_BgSlcPcs");
+    name_tbb_thread_pool_threads_set_locale();
 
 	assert(m_print != nullptr);
 	assert(m_print == m_fff_print || m_print == m_sla_print);
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index 3f388f485..4d50e1490 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -30,6 +30,8 @@
 #include "libslic3r/Platform.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Config.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Model.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
@@ -40,7 +42,7 @@
 #include "slic3r/Utils/PresetUpdater.hpp"
 #include "format.hpp"
 #include "MsgDialog.hpp"
-#include "libslic3r/libslic3r.h"
+#include "UnsavedChangesDialog.hpp"
 
 #if defined(__linux__) && defined(__WXGTK3__)
 #define wxLinux_gtk3 true
@@ -741,10 +743,10 @@ void PageMaterials::set_compatible_printers_html_window(const std::vector<std::s
     const auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
     const auto text_clr = wxGetApp().get_label_clr_default();//wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     const auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
-    wxString first_line = _L("Filaments marked with <b>*</b> are <b>not</b> compatible with some installed printers.");
+    wxString first_line = format_wxstr(_L("%1% marked with <b>*</b> are <b>not</b> compatible with some installed printers."), materials->technology == T_FFF ? _L("Filaments") : _L("SLA materials"));
     wxString text;
     if (all_printers) {
-        wxString second_line = _L("All installed printers are compatible with the selected filament.");
+        wxString second_line = format_wxstr(_L("All installed printers are compatible with the selected %1%."), materials->technology == T_FFF ? _L("filament") : _L("SLA material"));
         text = wxString::Format(
             "<html>"
             "<style>"
@@ -764,7 +766,7 @@ void PageMaterials::set_compatible_printers_html_window(const std::vector<std::s
             , second_line
             );
     } else {
-        wxString second_line = _L("Only the following installed printers are compatible with the selected filament:");
+        wxString second_line = printer_names.empty() ? "" : format_wxstr(_L("Only the following installed printers are compatible with the selected %1%:"), materials->technology == T_FFF ? _L("filament") : _L("SLA material"));
         text = wxString::Format(
             "<html>"
             "<style>"
@@ -2473,10 +2475,56 @@ static std::string get_first_added_preset(const std::map<std::string, std::strin
     return *diff.begin();
 }
 
-bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater)
+bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater, bool& apply_keeped_changes)
 {
+    wxString header, caption = _L("Configuration is editing from ConfigWizard");
     const auto enabled_vendors = appconfig_new.vendors();
 
+    bool suppress_sla_printer = model_has_multi_part_objects(wxGetApp().model());
+    PrinterTechnology preferred_pt = ptAny;
+    auto get_preferred_printer_technology = [enabled_vendors, suppress_sla_printer](const std::string& bundle_name, const Bundle& bundle) {
+        const auto config = enabled_vendors.find(bundle_name);
+        PrinterTechnology pt = ptAny;
+        if (config != enabled_vendors.end()) {
+            for (const auto& model : bundle.vendor_profile->models) {
+                if (const auto model_it = config->second.find(model.id);
+                    model_it != config->second.end() && model_it->second.size() > 0) {
+                    if (pt == ptAny)
+                        pt = model.technology;
+                    // if preferred printer model has SLA printer technology it's important to check the model for multypart state
+                    if (pt == ptSLA && suppress_sla_printer)
+                        continue;
+                    else
+                        return pt;
+                }
+            }
+        }
+        return pt;
+    };
+    // Prusa printers are considered first, then 3rd party.
+    if (preferred_pt = get_preferred_printer_technology("PrusaResearch", bundles.prusa_bundle());
+        preferred_pt == ptAny || (preferred_pt == ptSLA && suppress_sla_printer)) {
+        for (const auto& bundle : bundles) {
+            if (bundle.second.is_prusa_bundle) { continue; }
+            if (PrinterTechnology pt = get_preferred_printer_technology(bundle.first, bundle.second); pt == ptAny)
+                continue;
+            else if (preferred_pt == ptAny)
+                preferred_pt = pt;
+            if(!(preferred_pt == ptAny || (preferred_pt == ptSLA && suppress_sla_printer)))
+                break;
+        }
+    }
+
+    if (preferred_pt == ptSLA && !wxGetApp().may_switch_to_SLA_preset(caption))
+        return false;
+
+    bool check_unsaved_preset_changes = page_welcome->reset_user_profile();
+    if (check_unsaved_preset_changes)
+        header = _L("All user presets will be deleted.");
+    int act_btns = UnsavedChangesDialog::ActionButtons::KEEP;
+    if (!check_unsaved_preset_changes)
+        act_btns |= UnsavedChangesDialog::ActionButtons::SAVE;
+
     // Install bundles from resources if needed:
     std::vector<std::string> install_bundles;
     for (const auto &pair : bundles) {
@@ -2500,6 +2548,9 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
             install_bundles.emplace_back(pair.first);
         }
     }
+    if (!check_unsaved_preset_changes)
+        if ((check_unsaved_preset_changes = install_bundles.size() > 0))
+            header = _L_PLURAL("New vendor was installed and one of its printer will be activated", "New vendors were installed and one of theirs printer will be activated", install_bundles.size());
 
 #ifdef __linux__
     // Desktop integration on Linux
@@ -2531,6 +2582,10 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
     if (snapshot && ! take_config_snapshot_cancel_on_error(*app_config, snapshot_reason, "", _u8L("Continue with applying configuration changes?")))
         return false;
 
+    if (check_unsaved_preset_changes &&
+        !wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes))
+        return false;
+
     if (install_bundles.size() > 0) {
         // Install bundles from resources.
         // Don't create snapshot - we've already done that above if applicable.
@@ -2548,13 +2603,14 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
     std::string preferred_model;
     std::string preferred_variant;
     const auto enabled_vendors_old = app_config->vendors();
-    auto get_preferred_printer_model = [enabled_vendors, enabled_vendors_old](const std::string& bundle_name, const Bundle& bundle, std::string& variant) {
+    auto get_preferred_printer_model = [enabled_vendors, enabled_vendors_old, preferred_pt](const std::string& bundle_name, const Bundle& bundle, std::string& variant) {
         const auto config = enabled_vendors.find(bundle_name);
         if (config == enabled_vendors.end())
             return std::string();
         for (const auto& model : bundle.vendor_profile->models) {
             if (const auto model_it = config->second.find(model.id);
-                model_it != config->second.end() && model_it->second.size() > 0) {
+                model_it != config->second.end() && model_it->second.size() > 0 &&
+                preferred_pt == model.technology) {
                 variant = *model_it->second.begin();
                 const auto config_old = enabled_vendors_old.find(bundle_name);
                 if (config_old == enabled_vendors_old.end())
@@ -2586,17 +2642,52 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
         }
     }
 
+    // if unsaved changes was not cheched till this moment
+    if (!check_unsaved_preset_changes) {
+        if ((check_unsaved_preset_changes = !preferred_model.empty())) {
+            header = _L("A new Printer was installed and it will be activated.");
+            if (!wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes))
+                return false;
+        }
+        else if ((check_unsaved_preset_changes = enabled_vendors_old != enabled_vendors)) {
+            header = _L("Some Printers were uninstalled.");
+            if (!wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes))
+                return false;
+        }
+    }
+
     std::string first_added_filament, first_added_sla_material;
-    auto apply_section = [this, app_config](const std::string& section_name, std::string& first_added_preset) {
+    auto get_first_added_material_preset = [this, app_config](const std::string& section_name, std::string& first_added_preset) {
         if (appconfig_new.has_section(section_name)) {
             // get first of new added preset names
             const std::map<std::string, std::string>& old_presets = app_config->has_section(section_name) ? app_config->get_section(section_name) : std::map<std::string, std::string>();
             first_added_preset = get_first_added_preset(old_presets, appconfig_new.get_section(section_name));
-            app_config->set_section(section_name, appconfig_new.get_section(section_name));
         }
     };
-    apply_section(AppConfig::SECTION_FILAMENTS, first_added_filament);
-    apply_section(AppConfig::SECTION_MATERIALS, first_added_sla_material);
+    get_first_added_material_preset(AppConfig::SECTION_FILAMENTS, first_added_filament);
+    get_first_added_material_preset(AppConfig::SECTION_MATERIALS, first_added_sla_material);
+
+    // if unsaved changes was not cheched till this moment
+    if (!check_unsaved_preset_changes) {
+        if ((check_unsaved_preset_changes = !first_added_filament.empty() || !first_added_sla_material.empty())) {
+            header = format_wxstr(_L("A new %1% was installed and it will be activated."), !first_added_filament.empty() ? _L("Filament") : _L("SLA material"));
+            if (!wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes))
+                return false;
+        }
+        else {
+            bool is_filaments_changed = app_config->get_section(AppConfig::SECTION_FILAMENTS) != appconfig_new.get_section(AppConfig::SECTION_FILAMENTS);
+            bool is_sla_materials_changed = app_config->get_section(AppConfig::SECTION_MATERIALS) != appconfig_new.get_section(AppConfig::SECTION_MATERIALS);
+            if ((check_unsaved_preset_changes = is_filaments_changed || is_sla_materials_changed)) {
+                header = format_wxstr(_L("Some %1% were uninstalled."), is_filaments_changed ? _L("Filaments") : _L("SLA materials"));
+                if (!wxGetApp().check_and_keep_current_preset_changes(caption, header, act_btns, &apply_keeped_changes))
+                    return false;
+            }
+        }
+    }
+
+    // apply materials in app_config
+    for (const std::string& section_name : {AppConfig::SECTION_FILAMENTS, AppConfig::SECTION_MATERIALS})
+        app_config->set_section(section_name, appconfig_new.get_section(section_name));
 
     app_config->set_vendors(appconfig_new);
 
@@ -2624,10 +2715,16 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
 
     page_mode->serialize_mode(app_config);
 
-    preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem, 
-                                {preferred_model, preferred_variant, first_added_filament, first_added_sla_material});
+    if (check_unsaved_preset_changes)
+        preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem, 
+                                    {preferred_model, preferred_variant, first_added_filament, first_added_sla_material});
 
     if (page_custom->custom_wanted()) {
+        // if unsaved changes was not cheched till this moment
+        if (!check_unsaved_preset_changes && 
+            !wxGetApp().check_and_keep_current_preset_changes(caption, _L("Custom printer was installed and it will be activated."), act_btns, &apply_keeped_changes))
+            return false;
+
         page_firmware->apply_custom_config(*custom_config);
         page_bed->apply_custom_config(*custom_config);
         page_diams->apply_custom_config(*custom_config);
@@ -2851,8 +2948,13 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page)
     p->set_start_page(start_page);
 
     if (ShowModal() == wxID_OK) {
-        if (! p->apply_config(app.app_config, app.preset_bundle, app.preset_updater))
+        bool apply_keeped_changes = false;
+        if (! p->apply_config(app.app_config, app.preset_bundle, app.preset_updater, apply_keeped_changes))
             return false;
+
+        if (apply_keeped_changes)
+            app.apply_keeped_preset_modifications();
+
         app.app_config->set_legacy_datadir(false);
         app.update_mode();
         app.obj_manipul()->update_ui_from_settings();
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp
index 84def4202..d4b1fac04 100644
--- a/src/slic3r/GUI/ConfigWizard_private.hpp
+++ b/src/slic3r/GUI/ConfigWizard_private.hpp
@@ -611,7 +611,7 @@ struct ConfigWizard::priv
 
     bool on_bnt_finish();
     bool check_and_install_missing_materials(Technology technology, const std::string &only_for_model_id = std::string());
-    bool apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater);
+    bool apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater, bool& apply_keeped_changes);
     // #ys_FIXME_alise
     void update_presets_in_config(const std::string& section, const std::string& alias_key, bool add);
 #ifdef __linux__
diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp
index 7d7ed08a2..77679a1ad 100644
--- a/src/slic3r/GUI/DoubleSlider.cpp
+++ b/src/slic3r/GUI/DoubleSlider.cpp
@@ -1556,10 +1556,8 @@ void Control::OnMotion(wxMouseEvent& event)
     event.Skip();
 
     // Set tooltips with information for each icon
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     if (GUI::wxGetApp().is_editor())
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
-    this->SetToolTip(get_tooltip(tick));
+        this->SetToolTip(get_tooltip(tick));
 
     if (action) {
         wxCommandEvent e(wxEVT_SCROLL_CHANGED);
@@ -1821,7 +1819,8 @@ void Control::OnChar(wxKeyEvent& event)
 
 void Control::OnRightDown(wxMouseEvent& event)
 {
-    if (HasCapture()) return;
+    if (HasCapture() || m_is_left_down)
+        return;
     this->CaptureMouse();
 
     const wxPoint pos = event.GetLogicalPosition(wxClientDC(this));
@@ -2099,7 +2098,7 @@ void Control::auto_color_change()
 
 void Control::OnRightUp(wxMouseEvent& event)
 {
-    if (!HasCapture())
+    if (!HasCapture() || m_is_left_down)
         return;
     this->ReleaseMouse();
     m_is_right_down = m_is_one_layer = false;
diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp
index 5fe86db27..533b59398 100644
--- a/src/slic3r/GUI/ExtraRenderers.cpp
+++ b/src/slic3r/GUI/ExtraRenderers.cpp
@@ -323,15 +323,19 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR
 
     c_editor->SetSelection(atoi(data.GetText().c_str()));
 
-    // to avoid event propagation to other sidebar items
-    c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) {
-            evt.StopPropagation();
+    
 #ifdef __linux__
-            // FinishEditing grabs new selection and triggers config update. We better call
-            // it explicitly, automatic update on KILL_FOCUS didn't work on Linux.
-            this->FinishEditing();
-#endif
+    c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) {
+        // to avoid event propagation to other sidebar items
+        evt.StopPropagation();
+        // FinishEditing grabs new selection and triggers config update. We better call
+        // it explicitly, automatic update on KILL_FOCUS didn't work on Linux.
+        this->FinishEditing();
     });
+#else
+    // to avoid event propagation to other sidebar items
+    c_editor->Bind(wxEVT_COMBOBOX, [](wxCommandEvent& evt) { evt.StopPropagation(); });
+#endif
 
     return c_editor;
 }
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 06cfd0a1c..7dbb9d787 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -977,7 +977,7 @@ void Choice::BUILD() {
                 propagate_value();
         } );
 
-        temp->Bind(wxEVT_TEXT_ENTER, [this, temp](wxEvent& e) {
+        temp->Bind(wxEVT_TEXT_ENTER, [this](wxEvent& e) {
             EnterPressed enter(this);
             propagate_value();
         } );
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 9b7d8ec47..fd2fe9cbc 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -267,7 +267,12 @@ void GCodeViewer::SequentialView::Marker::render() const
     imgui.text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _u8L("Tool position") + ":");
     ImGui::SameLine();
     char buf[1024];
-    sprintf(buf, "X: %.3f, Y: %.3f, Z: %.3f", m_world_position(0), m_world_position(1), m_world_position(2));
+#if ENABLE_FIX_SEAMS_SYNCH
+    const Vec3f position = m_world_position + m_world_offset;
+    sprintf(buf, "X: %.3f, Y: %.3f, Z: %.3f", position.x(), position.y(), position.z());
+#else
+    sprintf(buf, "X: %.3f, Y: %.3f, Z: %.3f", m_world_position.x(), m_world_position.y(), m_world_position.z());
+#endif // ENABLE_FIX_SEAMS_SYNCH
     imgui.text(std::string(buf));
 
     // force extra frame to automatically update window size
@@ -568,6 +573,89 @@ GCodeViewer::GCodeViewer()
 //    m_sequential_view.skip_invisible_moves = true;
 }
 
+#if ENABLE_SEAMS_USING_MODELS
+void GCodeViewer::init()
+{
+    if (m_gl_data_initialized)
+        return;
+
+    // initializes opengl data of TBuffers
+    for (size_t i = 0; i < m_buffers.size(); ++i) {
+        TBuffer& buffer = m_buffers[i];
+        EMoveType type = buffer_type(i);
+        switch (type)
+        {
+        default: { break; }
+        case EMoveType::Tool_change:
+        case EMoveType::Color_change:
+        case EMoveType::Pause_Print:
+        case EMoveType::Custom_GCode:
+        case EMoveType::Retract:
+        case EMoveType::Unretract:
+        case EMoveType::Seam: {
+#if ENABLE_SEAMS_USING_BATCHED_MODELS
+            if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
+                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
+                buffer.shader = "gouraud_light_instanced";
+                buffer.model.model.init_from(diamond(16));
+                buffer.model.color = option_color(type);
+                buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
+            }
+            else {
+                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel;
+                buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
+                buffer.shader = "gouraud_light";
+
+                buffer.model.data = diamond(16);
+                buffer.model.color = option_color(type);
+                buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel;
+            }
+            break;
+#else
+            if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
+                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Model;
+                buffer.shader = "gouraud_light_instanced";
+                buffer.model.model.init_from(diamond(16));
+                buffer.model.color = option_color(type);
+            }
+            else {
+                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Point;
+                buffer.vertices.format = VBuffer::EFormat::Position;
+                buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110";
+            }
+            break;
+#endif // ENABLE_SEAMS_USING_BATCHED_MODELS
+        }
+        case EMoveType::Wipe:
+        case EMoveType::Extrude: {
+            buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Triangle;
+            buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
+            buffer.shader = "gouraud_light";
+            break;
+        }
+        case EMoveType::Travel: {
+            buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Line;
+            buffer.vertices.format = VBuffer::EFormat::PositionNormal1;
+            buffer.shader = "toolpaths_lines";
+            break;
+        }
+        }
+
+        set_toolpath_move_type_visible(EMoveType::Extrude, true);
+    }
+
+    // initializes tool marker
+    m_sequential_view.marker.init();
+
+    // initializes point sizes
+    std::array<int, 2> point_sizes;
+    ::glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_sizes.data());
+    m_detected_point_sizes = { static_cast<float>(point_sizes[0]), static_cast<float>(point_sizes[1]) };
+
+    m_gl_data_initialized = true;
+}
+#endif // ENABLE_SEAMS_USING_MODELS
+
 void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print& print, bool initialized)
 {
     // avoid processing if called with the same gcode_result
@@ -583,10 +671,8 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print&
         // Stealing out lines_ends should be safe because this gcode_result is processed only once (see the 1st if in this function).
         std::move(const_cast<std::vector<size_t>&>(gcode_result.lines_ends)));
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     if (wxGetApp().is_gcode_viewer())
         m_custom_gcode_per_print_z = gcode_result.custom_gcode_per_print_z;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
     load_toolpaths(gcode_result);
 
@@ -744,9 +830,7 @@ void GCodeViewer::reset()
     m_layers_z_range = { 0, 0 };
     m_roles = std::vector<ExtrusionRole>();
     m_print_statistics.reset();
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     m_custom_gcode_per_print_z = std::vector<CustomGCode::Item>();
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     m_sequential_view.gcode_window.reset();
 #if ENABLE_GCODE_VIEWER_STATISTICS
     m_statistics.reset_all();
@@ -755,6 +839,7 @@ void GCodeViewer::reset()
 
 void GCodeViewer::render()
 {
+#if !ENABLE_SEAMS_USING_MODELS
     auto init_gl_data = [this]() {
         // initializes opengl data of TBuffers
         for (size_t i = 0; i < m_buffers.size(); ++i) {
@@ -770,26 +855,6 @@ void GCodeViewer::render()
             case EMoveType::Retract:
             case EMoveType::Unretract:
             case EMoveType::Seam: {
-#if ENABLE_SEAMS_USING_MODELS
-#if ENABLE_SEAMS_USING_BATCHED_MODELS
-                if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
-                    buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
-                    buffer.shader = "gouraud_light_instanced";
-                    buffer.model.model.init_from(diamond(16));
-                    buffer.model.color = option_color(type);
-                    buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
-                }
-                else {
-                    buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel;
-                    buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
-                    buffer.shader = "gouraud_light";
-
-                    buffer.model.data = diamond(16);
-                    buffer.model.color = option_color(type);
-                    buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel;
-                }
-                break;
-#else
                 if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
                     buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Model;
                     buffer.shader = "gouraud_light_instanced";
@@ -802,36 +867,17 @@ void GCodeViewer::render()
                     buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110";
                 }
                 break;
-#endif // ENABLE_SEAMS_USING_BATCHED_MODELS
-#else
-                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Point;
-                buffer.vertices.format = VBuffer::EFormat::Position;
-                buffer.shader = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20) ? "options_120" : "options_110";
-                break;
-#endif // ENABLE_SEAMS_USING_MODELS
             }
             case EMoveType::Wipe:
             case EMoveType::Extrude: {
-#if ENABLE_SEAMS_USING_MODELS
-                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Triangle;
-                buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
-#endif // ENABLE_SEAMS_USING_MODELS
                 buffer.shader = "gouraud_light";
                 break;
             }
             case EMoveType::Travel: {
-#if ENABLE_SEAMS_USING_MODELS
-                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::Line;
-                buffer.vertices.format = VBuffer::EFormat::PositionNormal1;
-#endif // ENABLE_SEAMS_USING_MODELS
                 buffer.shader = "toolpaths_lines";
                 break;
             }
             }
-
-#if ENABLE_SEAMS_USING_MODELS
-            set_toolpath_move_type_visible(EMoveType::Extrude, true);
-#endif // ENABLE_SEAMS_USING_MODELS
         }
 
         // initializes tool marker
@@ -843,6 +889,7 @@ void GCodeViewer::render()
         m_detected_point_sizes = { static_cast<float>(point_sizes[0]), static_cast<float>(point_sizes[1]) };
         m_gl_data_initialized = true;
     };
+#endif // !ENABLE_SEAMS_USING_MODELS
 
 #if ENABLE_GCODE_VIEWER_STATISTICS
     m_statistics.reset_opengl();
@@ -851,10 +898,12 @@ void GCodeViewer::render()
 #endif // ENABLE_SEAMS_USING_MODELS
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
 
+#if !ENABLE_SEAMS_USING_MODELS
     // OpenGL data must be initialized after the glContext has been created.
     // This is ensured when this method is called by GLCanvas3D::_render_gcode().
     if (!m_gl_data_initialized)
         init_gl_data();
+#endif // !ENABLE_SEAMS_USING_MODELS
 
     if (m_roles.empty())
         return;
@@ -866,6 +915,9 @@ void GCodeViewer::render()
     render_legend(legend_height);
     if (m_sequential_view.current.last != m_sequential_view.endpoints.last) {
         m_sequential_view.marker.set_world_position(m_sequential_view.current_position);
+#if ENABLE_FIX_SEAMS_SYNCH
+        m_sequential_view.marker.set_world_offset(m_sequential_view.current_offset);
+#endif // ENABLE_FIX_SEAMS_SYNCH
         m_sequential_view.render(legend_height);
     }
 #if ENABLE_GCODE_VIEWER_STATISTICS
@@ -1504,10 +1556,18 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
     m_max_bounding_box = m_paths_bounding_box;
     m_max_bounding_box.merge(m_paths_bounding_box.max + m_sequential_view.marker.get_bounding_box().size()[2] * Vec3d::UnitZ());
 
+#if ENABLE_FIX_SEAMS_SYNCH
     m_sequential_view.gcode_ids.clear();
+    for (size_t i = 0; i < gcode_result.moves.size(); ++i) {
+        const GCodeProcessor::MoveVertex& move = gcode_result.moves[i];
+        if (move.type != EMoveType::Seam)
+            m_sequential_view.gcode_ids.push_back(move.gcode_id);
+    }
+#else
     for (const GCodeProcessor::MoveVertex& move : gcode_result.moves) {
         m_sequential_view.gcode_ids.push_back(move.gcode_id);
     }
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
     std::vector<MultiVertexBuffer> vertices(m_buffers.size());
     std::vector<MultiIndexBuffer> indices(m_buffers.size());
@@ -1515,11 +1575,27 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
     std::vector<InstanceBuffer> instances(m_buffers.size());
     std::vector<InstanceIdBuffer> instances_ids(m_buffers.size());
 #endif // ENABLE_SEAMS_USING_MODELS
+#if ENABLE_FIX_SEAMS_SYNCH
+    std::vector<InstancesOffsets> instances_offsets(m_buffers.size());
+#endif // ENABLE_FIX_SEAMS_SYNCH
     std::vector<float> options_zs;
 
+#if ENABLE_FIX_SEAMS_SYNCH
+    size_t seams_count = 0;
+    std::vector<size_t> seams_ids;
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
     // toolpaths data -> extract vertices from result
     for (size_t i = 0; i < m_moves_count; ++i) {
         const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+        if (curr.type == EMoveType::Seam) {
+            ++seams_count;
+            seams_ids.push_back(i);
+        }
+
+        size_t move_id = i - seams_count;
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
         // skip first vertex
         if (i == 0)
@@ -1542,6 +1618,9 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
 #if ENABLE_SEAMS_USING_MODELS
         InstanceBuffer& inst_buffer = instances[id];
         InstanceIdBuffer& inst_id_buffer = instances_ids[id];
+#if ENABLE_FIX_SEAMS_SYNCH
+        InstancesOffsets& inst_offsets = instances_offsets[id];
+#endif // ENABLE_FIX_SEAMS_SYNCH
 #endif // ENABLE_SEAMS_USING_MODELS
 
         // ensure there is at least one vertex buffer
@@ -1560,7 +1639,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             if (t_buffer.render_primitive_type == TBuffer::ERenderPrimitiveType::Triangle) {
                 Path& last_path = t_buffer.paths.back();
                 if (prev.type == curr.type && last_path.matches(curr))
+#if ENABLE_FIX_SEAMS_SYNCH
+                    last_path.add_sub_path(prev, static_cast<unsigned int>(v_multibuffer.size()) - 1, 0, move_id - 1);
+#else
                     last_path.add_sub_path(prev, static_cast<unsigned int>(v_multibuffer.size()) - 1, 0, i - 1);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             }
         }
 
@@ -1570,12 +1653,21 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
         {
         case TBuffer::ERenderPrimitiveType::Point:    { add_vertices_as_point(curr, v_buffer); break; }
         case TBuffer::ERenderPrimitiveType::Line:     { add_vertices_as_line(prev, curr, v_buffer); break; }
+#if ENABLE_FIX_SEAMS_SYNCH
+        case TBuffer::ERenderPrimitiveType::Triangle: { add_vertices_as_solid(prev, curr, t_buffer, static_cast<unsigned int>(v_multibuffer.size()) - 1, v_buffer, move_id); break; }
+#else
         case TBuffer::ERenderPrimitiveType::Triangle: { add_vertices_as_solid(prev, curr, t_buffer, static_cast<unsigned int>(v_multibuffer.size()) - 1, v_buffer, i); break; }
+#endif // ENABLE_FIX_SEAMS_SYNCH
 #if ENABLE_SEAMS_USING_MODELS
 #if ENABLE_SEAMS_USING_BATCHED_MODELS
         case TBuffer::ERenderPrimitiveType::InstancedModel:
         {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_model_instance(curr, inst_buffer, inst_id_buffer, move_id);
+            inst_offsets.push_back(prev.position - curr.position);
+#else
             add_model_instance(curr, inst_buffer, inst_id_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
 #if ENABLE_GCODE_VIEWER_STATISTICS
             ++m_statistics.instances_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1583,7 +1675,12 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
         }
         case TBuffer::ERenderPrimitiveType::BatchedModel:
         {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_vertices_as_model_batch(curr, t_buffer.model.data, v_buffer, inst_buffer, inst_id_buffer, move_id);
+            inst_offsets.push_back(prev.position - curr.position);
+#else
             add_vertices_as_model_batch(curr, t_buffer.model.data, v_buffer, inst_buffer, inst_id_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
 #if ENABLE_GCODE_VIEWER_STATISTICS
             ++m_statistics.batched_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1592,7 +1689,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
 #else
         case TBuffer::ERenderPrimitiveType::Model:
         {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_model_instance(curr, inst_buffer, inst_id_buffer, move_id);
+#else
             add_model_instance(curr, inst_buffer, inst_id_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
 #if ENABLE_GCODE_VIEWER_STATISTICS
             ++m_statistics.instances_count;
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
@@ -1611,7 +1712,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
     }
 
     // smooth toolpaths corners for the given TBuffer using triangles
+#if ENABLE_FIX_SEAMS_SYNCH
+    auto smooth_triangle_toolpaths_corners = [&gcode_result, &seams_ids](const TBuffer& t_buffer, MultiVertexBuffer& v_multibuffer) {
+#else
     auto smooth_triangle_toolpaths_corners = [&gcode_result](const TBuffer& t_buffer, MultiVertexBuffer& v_multibuffer) {
+#endif // ENABLE_FIX_SEAMS_SYNCH
         auto extract_position_at = [](const VertexBuffer& vertices, size_t offset) {
             return Vec3f(vertices[offset + 0], vertices[offset + 1], vertices[offset + 2]);
         };
@@ -1685,6 +1790,16 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
                 }
         };
 
+#if ENABLE_FIX_SEAMS_SYNCH
+        auto extract_move_id = [&seams_ids](size_t id) {
+            for (int i = seams_ids.size() - 1; i >= 0; --i) {
+                if (seams_ids[i] < id + i + 1)
+                    return id + (size_t)i + 1;
+            }
+            return id;
+        };
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
         size_t vertex_size_floats = t_buffer.vertices.vertex_size_floats();
         for (const Path& path : t_buffer.paths) {
             // the two segments of the path sharing the current vertex may belong
@@ -1695,9 +1810,16 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             const float half_width = 0.5f * path.width;
             for (size_t j = 1; j < path_vertices_count - 1; ++j) {
                 size_t curr_s_id = path.sub_paths.front().first.s_id + j;
+#if ENABLE_FIX_SEAMS_SYNCH
+                size_t move_id = extract_move_id(curr_s_id);
+                const Vec3f& prev = gcode_result.moves[move_id - 1].position;
+                const Vec3f& curr = gcode_result.moves[move_id].position;
+                const Vec3f& next = gcode_result.moves[move_id + 1].position;
+#else
                 const Vec3f& prev = gcode_result.moves[curr_s_id - 1].position;
                 const Vec3f& curr = gcode_result.moves[curr_s_id].position;
                 const Vec3f& next = gcode_result.moves[curr_s_id + 1].position;
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
                 // select the subpaths which contains the previous/next segments
                 if (!path.sub_paths[prev_sub_path_id].contains(curr_s_id))
@@ -1764,6 +1886,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
         }
     }
 
+#if ENABLE_FIX_SEAMS_SYNCH
+    // dismiss, no more needed
+    std::vector<size_t>().swap(seams_ids);
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
     for (MultiVertexBuffer& v_multibuffer : vertices) {
         for (VertexBuffer& v_buffer : v_multibuffer) {
             v_buffer.shrink_to_fit();
@@ -1788,6 +1915,9 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             if (!inst_buffer.empty()) {
                 t_buffer.model.instances.buffer = inst_buffer;
                 t_buffer.model.instances.s_ids = instances_ids[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+                t_buffer.model.instances.offsets = instances_offsets[i];
+#endif // ENABLE_FIX_SEAMS_SYNCH
             }
         }
         else {
@@ -1796,6 +1926,9 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
                 if (!inst_buffer.empty()) {
                     t_buffer.model.instances.buffer = inst_buffer;
                     t_buffer.model.instances.s_ids = instances_ids[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+                    t_buffer.model.instances.offsets = instances_offsets[i];
+#endif // ENABLE_FIX_SEAMS_SYNCH
                 }
             }
 #else
@@ -1804,6 +1937,9 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             if (!inst_buffer.empty()) {
                 t_buffer.model.instances.buffer = inst_buffer;
                 t_buffer.model.instances.s_ids = instances_ids[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+                t_buffer.model.instances.offsets = instances_offsets[i];
+#endif // ENABLE_FIX_SEAMS_SYNCH
             }
         }
         else {
@@ -1864,8 +2000,18 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
     using VboIndexList = std::vector<unsigned int>;
     std::vector<VboIndexList> vbo_indices(m_buffers.size());
 
+#if ENABLE_FIX_SEAMS_SYNCH
+    seams_count = 0;
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
     for (size_t i = 0; i < m_moves_count; ++i) {
         const GCodeProcessor::MoveVertex& curr = gcode_result.moves[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+        if (curr.type == EMoveType::Seam)
+            ++seams_count;
+
+        size_t move_id = i - seams_count;
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
         // skip first vertex
         if (i == 0)
@@ -1916,7 +2062,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Point) {
 #endif // ENABLE_SEAMS_USING_BATCHED_MODELS
                 Path& last_path = t_buffer.paths.back();
+#if ENABLE_FIX_SEAMS_SYNCH
+                last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, move_id - 1);
+#else
                 last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, i - 1);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             }
         }
 
@@ -1941,7 +2091,11 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
             if (t_buffer.render_primitive_type != TBuffer::ERenderPrimitiveType::Point) {
 #endif // ENABLE_SEAMS_USING_BATCHED_MODELS
                 Path& last_path = t_buffer.paths.back();
+#if ENABLE_FIX_SEAMS_SYNCH
+                last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, move_id - 1);
+#else
                 last_path.add_sub_path(prev, static_cast<unsigned int>(i_multibuffer.size()) - 1, 0, i - 1);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             }
         }
 
@@ -1950,17 +2104,29 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
         switch (t_buffer.render_primitive_type)
         {
         case TBuffer::ERenderPrimitiveType::Point: {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_indices_as_point(curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id);
+#else
             add_indices_as_point(curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             curr_vertex_buffer.second += t_buffer.max_vertices_per_segment();
             break;
         }
         case TBuffer::ERenderPrimitiveType::Line: {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_indices_as_line(prev, curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id);
+#else
             add_indices_as_line(prev, curr, t_buffer, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             curr_vertex_buffer.second += t_buffer.max_vertices_per_segment();
             break;
         }
         case TBuffer::ERenderPrimitiveType::Triangle: {
+#if ENABLE_FIX_SEAMS_SYNCH
+            add_indices_as_solid(prev, curr, next, t_buffer, curr_vertex_buffer.second, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, move_id);
+#else
             add_indices_as_solid(prev, curr, next, t_buffer, curr_vertex_buffer.second, static_cast<unsigned int>(i_multibuffer.size()) - 1, i_buffer, i);
+#endif // ENABLE_FIX_SEAMS_SYNCH
             break;
         }
 #if ENABLE_SEAMS_USING_BATCHED_MODELS
@@ -2055,16 +2221,34 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
 
     // layers zs / roles / extruder ids -> extract from result
     size_t last_travel_s_id = 0;
+#if ENABLE_FIX_SEAMS_SYNCH
+    seams_count = 0;
+#endif // ENABLE_FIX_SEAMS_SYNCH
     for (size_t i = 0; i < m_moves_count; ++i) {
         const GCodeProcessor::MoveVertex& move = gcode_result.moves[i];
+#if ENABLE_FIX_SEAMS_SYNCH
+        if (move.type == EMoveType::Seam)
+            ++seams_count;
+
+        size_t move_id = i - seams_count;
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
         if (move.type == EMoveType::Extrude) {
             // layers zs
             const double* const last_z = m_layers.empty() ? nullptr : &m_layers.get_zs().back();
             const double z = static_cast<double>(move.position.z());
             if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z)
+#if ENABLE_FIX_SEAMS_SYNCH
+                m_layers.append(z, { last_travel_s_id, move_id });
+#else
                 m_layers.append(z, { last_travel_s_id, i });
+#endif // ENABLE_FIX_SEAMS_SYNCH
             else
+#if ENABLE_FIX_SEAMS_SYNCH
+                m_layers.get_endpoints().back().last = move_id;
+#else
                 m_layers.get_endpoints().back().last = i;
+#endif // ENABLE_FIX_SEAMS_SYNCH
             // extruder ids
             m_extruder_ids.emplace_back(move.extruder_id);
             // roles
@@ -2072,10 +2256,17 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
                 m_roles.emplace_back(move.extrusion_role);
         }
         else if (move.type == EMoveType::Travel) {
+#if ENABLE_FIX_SEAMS_SYNCH
+            if (move_id - last_travel_s_id > 1 && !m_layers.empty())
+                m_layers.get_endpoints().back().last = move_id;
+
+            last_travel_s_id = move_id;
+#else
             if (i - last_travel_s_id > 1 && !m_layers.empty())
                 m_layers.get_endpoints().back().last = i;
-
+            
             last_travel_s_id = i;
+#endif // ENABLE_FIX_SEAMS_SYNCH
         }
     }
 
@@ -2346,6 +2537,9 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
                     sequential_view->current_position.x() = buffer.model.instances.buffer[offset + 0];
                     sequential_view->current_position.y() = buffer.model.instances.buffer[offset + 1];
                     sequential_view->current_position.z() = buffer.model.instances.buffer[offset + 2];
+#if ENABLE_FIX_SEAMS_SYNCH
+                    sequential_view->current_offset = buffer.model.instances.offsets[i];
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
                     found = true;
                     break;
@@ -2385,6 +2579,10 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
                         glsafe(::glGetBufferSubData(GL_ARRAY_BUFFER, static_cast<GLintptr>(index * buffer.vertices.vertex_size_bytes()), static_cast<GLsizeiptr>(3 * sizeof(float)), static_cast<void*>(sequential_view->current_position.data())));
                         glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
 
+#if ENABLE_FIX_SEAMS_SYNCH
+                        sequential_view->current_offset = Vec3f::Zero();
+#endif // ENABLE_FIX_SEAMS_SYNCH
+
                         found = true;
                         break;
                     }
@@ -3005,6 +3203,14 @@ void GCodeViewer::render_shells()
     if (shader == nullptr)
         return;
 
+    // when the background processing is enabled, it may happen that the shells data have been loaded
+    // before opengl has been initialized for the preview canvas.
+    // when this happens, the volumes' data have not been sent to gpu yet.
+    for (GLVolume* v : m_shells.volumes.volumes) {
+        if (!v->indexed_vertex_array.has_VBOs())
+            v->finalize_geometry(true);
+    }
+
 //    glsafe(::glDepthMask(GL_FALSE));
 
     shader->start_using();
@@ -3048,7 +3254,11 @@ void GCodeViewer::render_legend(float& legend_height)
 
     bool imperial_units = wxGetApp().app_config->get("use_inches") == "1";
 
+#if ENABLE_SEAMS_USING_BATCHED_MODELS
     auto append_item = [icon_size, percent_bar_size, &imgui, imperial_units](EItemType type, const Color& color, const std::string& label,
+#else
+    auto append_item = [this, icon_size, percent_bar_size, &imgui, imperial_units](EItemType type, const Color& color, const std::string& label,
+#endif // ENABLE_SEAMS_USING_BATCHED_MODELS
         bool visible = true, const std::string& time = "", float percent = 0.0f, float max_percent = 0.0f, const std::array<float, 4>& offsets = { 0.0f, 0.0f, 0.0f, 0.0f },
         double used_filament_m = 0.0, double used_filament_g = 0.0,
         std::function<void()> callback = nullptr) {
@@ -3409,11 +3619,7 @@ void GCodeViewer::render_legend(float& legend_height)
     }
     case EViewType::ColorPrint:
     {
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         const std::vector<CustomGCode::Item>& custom_gcode_per_print_z = wxGetApp().is_editor() ? wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes : m_custom_gcode_per_print_z;
-#else
-        const std::vector<CustomGCode::Item>& custom_gcode_per_print_z = wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         size_t total_items = 1;
         for (unsigned char i : m_extruder_ids) {
             total_items += color_print_ranges(i, custom_gcode_per_print_z).size();
@@ -3508,11 +3714,7 @@ void GCodeViewer::render_legend(float& legend_height)
         auto generate_partial_times = [this, get_used_filament_from_volume](const TimesList& times, const std::vector<double>& used_filaments) {
             PartialTimes items;
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             std::vector<CustomGCode::Item> custom_gcode_per_print_z = wxGetApp().is_editor() ? wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes : m_custom_gcode_per_print_z;
-#else
-            std::vector<CustomGCode::Item> custom_gcode_per_print_z = wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             int extruders_count = wxGetApp().extruders_edited_cnt();
             std::vector<Color> last_color(extruders_count);
             for (int i = 0; i < extruders_count; ++i) {
diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp
index f566c80bd..1b5a53f9d 100644
--- a/src/slic3r/GUI/GCodeViewer.hpp
+++ b/src/slic3r/GUI/GCodeViewer.hpp
@@ -31,6 +31,9 @@ class GCodeViewer
     using InstanceBuffer = std::vector<float>;
     using InstanceIdBuffer = std::vector<size_t>;
 #endif // ENABLE_SEAMS_USING_MODELS
+#if ENABLE_FIX_SEAMS_SYNCH
+    using InstancesOffsets = std::vector<Vec3f>;
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
     static const std::vector<Color> Extrusion_Role_Colors;
     static const std::vector<Color> Options_Colors;
@@ -151,6 +154,10 @@ class GCodeViewer
         InstanceBuffer buffer;
         // indices of the moves for all instances
         std::vector<size_t> s_ids;
+#if ENABLE_FIX_SEAMS_SYNCH
+        // position offsets, used to show the correct value of the tool position
+        InstancesOffsets offsets;
+#endif // ENABLE_FIX_SEAMS_SYNCH
         Ranges render_ranges;
 
         size_t data_size_bytes() const { return s_ids.size() * instance_size_bytes(); }
@@ -665,6 +672,12 @@ public:
             GLModel m_model;
             Vec3f m_world_position;
             Transform3f m_world_transform;
+#if ENABLE_FIX_SEAMS_SYNCH
+            // for seams, the position of the marker is on the last endpoint of the toolpath containing it
+            // the offset is used to show the correct value of tool position in the "ToolPosition" window
+            // see implementation of render() method
+            Vec3f m_world_offset;
+#endif // ENABLE_FIX_SEAMS_SYNCH
             float m_z_offset{ 0.5f };
             bool m_visible{ true };
 
@@ -674,6 +687,9 @@ public:
             const BoundingBoxf3& get_bounding_box() const { return m_model.get_bounding_box(); }
 
             void set_world_position(const Vec3f& position);
+#if ENABLE_FIX_SEAMS_SYNCH
+            void set_world_offset(const Vec3f& offset) { m_world_offset = offset; }
+#endif // ENABLE_FIX_SEAMS_SYNCH
 
             bool is_visible() const { return m_visible; }
             void set_visible(bool visible) { m_visible = visible; }
@@ -731,6 +747,9 @@ public:
         Endpoints global;
 #endif // ENABLE_SEAMS_USING_MODELS
         Vec3f current_position{ Vec3f::Zero() };
+#if ENABLE_FIX_SEAMS_SYNCH
+        Vec3f current_offset{ Vec3f::Zero() };
+#endif // ENABLE_FIX_SEAMS_SYNCH
         Marker marker;
         GCodeWindow gcode_window;
         std::vector<unsigned int> gcode_ids;
@@ -783,14 +802,16 @@ private:
     GCodeProcessor::Result::SettingsIds m_settings_ids;
     std::array<SequentialRangeCap, 2> m_sequential_range_caps;
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     std::vector<CustomGCode::Item> m_custom_gcode_per_print_z;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
 public:
     GCodeViewer();
     ~GCodeViewer() { reset(); }
 
+#if ENABLE_SEAMS_USING_MODELS
+    void init();
+#endif // ENABLE_SEAMS_USING_MODELS
+
     // extract rendering data from the given parameters
     void load(const GCodeProcessor::Result& gcode_result, const Print& print, bool initialized);
     // recalculate ranges in dependence of what is visible and sets tool/print colors
@@ -834,10 +855,8 @@ public:
 
     void toggle_gcode_window_visibility() { m_sequential_view.gcode_window.toggle_visibility(); }
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     std::vector<CustomGCode::Item>& get_custom_gcode_per_print_z() { return m_custom_gcode_per_print_z; }
     size_t get_extruders_count() { return m_extruders_count; }
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
 private:
     void load_toolpaths(const GCodeProcessor::Result& gcode_result);
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 989642bab..7325c3e03 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -23,6 +23,7 @@
 #include "slic3r/GUI/3DBed.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
@@ -1399,6 +1400,11 @@ void GLCanvas3D::render()
     if (!is_initialized() && !init())
         return;
 
+#if ENABLE_SEAMS_USING_MODELS
+    if (!m_main_toolbar.is_enabled())
+        m_gcode_viewer.init();
+#endif // ENABLE_SEAMS_USING_MODELS
+
     if (wxGetApp().plater()->get_bed().get_shape().empty()) {
         // this happens at startup when no data is still saved under <>\AppData\Roaming\Slic3rPE
         post_event(SimpleEvent(EVT_GLCANVAS_UPDATE_BED_SHAPE));
@@ -1450,19 +1456,13 @@ void GLCanvas3D::render()
     glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
     _render_background();
 
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
     _render_objects(GLVolumeCollection::ERenderType::Opaque);
-#else
-    _render_objects();
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
     if (!m_main_toolbar.is_enabled())
         _render_gcode();
     _render_sla_slices();
     _render_selection();
     _render_bed(!camera.is_looking_downward(), true);
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
     _render_objects(GLVolumeCollection::ERenderType::Transparent);
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
 
     _render_sequential_clearance();
 #if ENABLE_RENDER_SELECTION_CENTER
@@ -2933,7 +2933,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         return;
     }
 
-#if ENABLE_SINKING_CONTOURS
     for (GLVolume* volume : m_volumes.volumes) {
         volume->force_sinking_contours = false;
     }
@@ -2945,7 +2944,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         }
         m_dirty = true;
     };
-#endif // ENABLE_SINKING_CONTOURS
 
     if (m_gizmos.on_mouse(evt)) {
         if (wxWindow::FindFocus() != m_canvas)
@@ -2971,7 +2969,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             default: { break; }
             }
         }
-#if ENABLE_SINKING_CONTOURS
         else if (evt.Dragging()) {
             switch (m_gizmos.get_current_type())
             {
@@ -2985,7 +2982,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             default: { break; }
             }
         }
-#endif // ENABLE_SINKING_CONTOURS
 
         return;
     }
@@ -3307,10 +3303,8 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
     else
         evt.Skip();
 
-#if ENABLE_SINKING_CONTOURS
     if (m_moving)
         show_sinking_contours();
-#endif // ENABLE_SINKING_CONTOURS
 
 #ifdef __WXMSW__
 	if (on_enter_workaround)
@@ -4452,12 +4446,11 @@ bool GLCanvas3D::_init_main_toolbar()
     arrow_data.top = 0;
     arrow_data.right = 0;
     arrow_data.bottom = 0;
-
     if (!m_main_toolbar.init_arrow(arrow_data))
     {
         BOOST_LOG_TRIVIAL(error) << "Main toolbar failed to load arrow texture.";
     }
-
+    // m_gizmos is created at constructor, thus we can init arrow here.
     if (!m_gizmos.init_arrow(arrow_data))
     {
         BOOST_LOG_TRIVIAL(error) << "Gizmos manager failed to load arrow texture.";
@@ -4668,6 +4661,18 @@ bool GLCanvas3D::_init_undoredo_toolbar()
         return true;
     }
 
+    // init arrow
+    BackgroundTexture::Metadata arrow_data;
+    arrow_data.filename = "toolbar_arrow.svg";
+    arrow_data.left = 0;
+    arrow_data.top = 0;
+    arrow_data.right = 0;
+    arrow_data.bottom = 0;
+    if (!m_undoredo_toolbar.init_arrow(arrow_data))
+    {
+        BOOST_LOG_TRIVIAL(error) << "Undo/Redo toolbar failed to load arrow texture.";
+    }
+
 //    m_undoredo_toolbar.set_layout_type(GLToolbar::Layout::Vertical);
     m_undoredo_toolbar.set_layout_type(GLToolbar::Layout::Horizontal);
     m_undoredo_toolbar.set_horizontal_orientation(GLToolbar::Layout::HO_Left);
@@ -5084,12 +5089,7 @@ void GLCanvas3D::_render_bed_for_picking(bool bottom)
     wxGetApp().plater()->get_bed().render_for_picking(*this, bottom, scale_factor);
 }
 
-
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
 void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type)
-#else
-void GLCanvas3D::_render_objects()
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
 {
     if (m_volumes.empty())
         return;
@@ -5121,20 +5121,14 @@ void GLCanvas3D::_render_objects()
     if (shader != nullptr) {
         shader->start_using();
 
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
         switch (type)
         {
         default:
         case GLVolumeCollection::ERenderType::Opaque:
         {
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
             if (m_picking_enabled && !m_gizmos.is_dragging() && m_layers_editing.is_enabled() && (m_layers_editing.last_object_id != -1) && (m_layers_editing.object_max_z() > 0.0f)) {
                 int object_id = m_layers_editing.last_object_id;
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
                 m_volumes.render(type, false, wxGetApp().plater()->get_camera().get_view_matrix(), [object_id](const GLVolume& volume) {
-#else
-                m_volumes.render(GLVolumeCollection::ERenderType::Opaque, false, wxGetApp().plater()->get_camera().get_view_matrix(), [object_id](const GLVolume& volume) {
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
                     // Which volume to paint without the layer height profile shader?
                     return volume.is_active && (volume.is_modifier || volume.composite_id.object_id != object_id);
                     });
@@ -5143,11 +5137,7 @@ void GLCanvas3D::_render_objects()
             }
             else {
                 // do not cull backfaces to show broken geometry, if any
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
                 m_volumes.render(type, m_picking_enabled, wxGetApp().plater()->get_camera().get_view_matrix(), [this](const GLVolume& volume) {
-#else
-                m_volumes.render(GLVolumeCollection::ERenderType::Opaque, m_picking_enabled, wxGetApp().plater()->get_camera().get_view_matrix(), [this](const GLVolume& volume) {
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
                     return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0);
                     });
             }
@@ -5160,13 +5150,13 @@ void GLCanvas3D::_render_objects()
                 GLGizmosManager::EType type = gm.get_current_type();
                 if (type == GLGizmosManager::FdmSupports
                     || type == GLGizmosManager::Seam
-                    || type == GLGizmosManager::MmuSegmentation) {
+                    || type == GLGizmosManager::MmuSegmentation 
+                    || type == GLGizmosManager::Simplify ) {
                     shader->stop_using();
                     gm.render_painter_gizmo();
                     shader->start_using();
                 }
             }
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
             break;
         }
         case GLVolumeCollection::ERenderType::Transparent:
@@ -5175,9 +5165,6 @@ void GLCanvas3D::_render_objects()
             break;
         }
         }
-#else
-        m_volumes.render(GLVolumeCollection::ERenderType::Transparent, false, wxGetApp().plater()->get_camera().get_view_matrix());
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
         shader->stop_using();
     }
 
@@ -5420,6 +5407,10 @@ void GLCanvas3D::_render_undoredo_toolbar()
 
     m_undoredo_toolbar.set_position(top, left);
     m_undoredo_toolbar.render(*this);
+    if (m_toolbar_highlighter.m_render_arrow)
+    {
+        m_undoredo_toolbar.render_arrow(*this, m_toolbar_highlighter.m_toolbar_item);
+    }
 }
 
 void GLCanvas3D::_render_collapse_toolbar() const
@@ -5686,11 +5677,8 @@ void GLCanvas3D::_update_volumes_hover_state()
                 }
             }
         }
-#if ENABLE_SINKING_CONTOURS
         else if (volume.selected)
             volume.hover = GLVolume::HS_Hover;
-#endif // ENABLE_SINKING_CONTOURS
-
     }
 }
 
@@ -6459,7 +6447,7 @@ void GLCanvas3D::_update_selection_from_hover()
 
         // the selection is going to be modified (Add)
         if (!contains_all) {
-            wxGetApp().plater()->take_snapshot(_(L("Selection-Add from rectangle")));
+            wxGetApp().plater()->take_snapshot(_(L("Selection-Add from rectangle")), UndoRedo::SnapshotType::Selection);
             selection_changed = true;
         }
     }
@@ -6474,7 +6462,7 @@ void GLCanvas3D::_update_selection_from_hover()
 
         // the selection is going to be modified (Remove)
         if (contains_any) {
-            wxGetApp().plater()->take_snapshot(_(L("Selection-Remove from rectangle")));
+            wxGetApp().plater()->take_snapshot(_(L("Selection-Remove from rectangle")), UndoRedo::SnapshotType::Selection);
             selection_changed = true;
         }
     }
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 704adb010..86ec5634f 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -617,6 +617,9 @@ public:
     void reset_volumes();
     ModelInstanceEPrintVolumeState check_volumes_outside_state() const;
 
+#if ENABLE_SEAMS_USING_MODELS
+    void init_gcode_viewer() { m_gcode_viewer.init(); }
+#endif // ENABLE_SEAMS_USING_MODELS
     void reset_gcode_toolpaths() { m_gcode_viewer.reset(); }
     const GCodeViewer::SequentialView& get_gcode_sequential_view() const { return m_gcode_viewer.get_sequential_view(); }
     void update_gcode_sequential_view_current(unsigned int first, unsigned int last) { m_gcode_viewer.update_sequential_view_current(first, last); }
@@ -710,10 +713,8 @@ public:
     void set_toolpath_view_type(GCodeViewer::EViewType type);
     void set_volumes_z_range(const std::array<double, 2>& range);
     void set_toolpaths_z_range(const std::array<unsigned int, 2>& range);
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     std::vector<CustomGCode::Item>& get_custom_gcode_per_print_z() { return m_gcode_viewer.get_custom_gcode_per_print_z(); }
     size_t get_gcode_extruders_count() { return m_gcode_viewer.get_extruders_count(); }
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
     std::vector<int> load_object(const ModelObject& model_object, int obj_idx, std::vector<int> instance_idxs);
     std::vector<int> load_object(const Model& model, int obj_idx);
@@ -895,11 +896,7 @@ private:
     void _render_background() const;
     void _render_bed(bool bottom, bool show_axes);
     void _render_bed_for_picking(bool bottom);
-#if ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
     void _render_objects(GLVolumeCollection::ERenderType type);
-#else
-    void _render_objects();
-#endif // ENABLE_DELAYED_TRANSPARENT_VOLUMES_RENDERING
     void _render_gcode();
     void _render_selection() const;
     void _render_sequential_clearance();
diff --git a/src/slic3r/GUI/GLModel.cpp b/src/slic3r/GUI/GLModel.cpp
index d22925673..fb27aced5 100644
--- a/src/slic3r/GUI/GLModel.cpp
+++ b/src/slic3r/GUI/GLModel.cpp
@@ -7,9 +7,7 @@
 
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Model.hpp"
-#if ENABLE_SINKING_CONTOURS
 #include "libslic3r/Polygon.hpp"
-#endif // ENABLE_SINKING_CONTOURS
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -78,7 +76,7 @@ void GLModel::init_from(const InitializationData& data)
     }
 }
 
-void GLModel::init_from(const TriangleMesh& mesh)
+void GLModel::init_from(const indexed_triangle_set& its, const BoundingBoxf3 &bbox)
 {
     if (!m_render_data.empty()) // call reset() if you want to reuse this model
         return;
@@ -86,31 +84,36 @@ void GLModel::init_from(const TriangleMesh& mesh)
     RenderData data;
     data.type = PrimitiveType::Triangles;
 
-    std::vector<float> vertices = std::vector<float>(18 * mesh.stl.stats.number_of_facets);
-    std::vector<unsigned int> indices = std::vector<unsigned int>(3 * mesh.stl.stats.number_of_facets);
+    std::vector<float> vertices = std::vector<float>(18 * its.indices.size());
+    std::vector<unsigned int> indices = std::vector<unsigned int>(3 * its.indices.size());
 
     unsigned int vertices_count = 0;
-    for (uint32_t i = 0; i < mesh.stl.stats.number_of_facets; ++i) {
-        const stl_facet& facet = mesh.stl.facet_start[i];
-        for (size_t j = 0; j < 3; ++j) {
+    for (uint32_t i = 0; i < its.indices.size(); ++i) {
+        stl_triangle_vertex_indices face      = its.indices[i];
+        stl_vertex                  vertex[3] = { its.vertices[face[0]], its.vertices[face[1]], its.vertices[face[2]] };
+        stl_vertex                  n         = face_normal_normalized(vertex);
+        for (size_t j = 0; j < 3; ++ j) {
             size_t offset = i * 18 + j * 6;
-            ::memcpy(static_cast<void*>(&vertices[offset]), static_cast<const void*>(facet.vertex[j].data()), 3 * sizeof(float));
-            ::memcpy(static_cast<void*>(&vertices[3 + offset]), static_cast<const void*>(facet.normal.data()), 3 * sizeof(float));
+            ::memcpy(static_cast<void*>(&vertices[offset]), static_cast<const void*>(vertex[j].data()), 3 * sizeof(float));
+            ::memcpy(static_cast<void*>(&vertices[3 + offset]), static_cast<const void*>(n.data()), 3 * sizeof(float));
         }
-        for (size_t j = 0; j < 3; ++j) {
+        for (size_t j = 0; j < 3; ++j)
             indices[i * 3 + j] = vertices_count + j;
-        }
         vertices_count += 3;
     }
 
     data.indices_count = static_cast<unsigned int>(indices.size());
-    m_bounding_box = mesh.bounding_box();
+    m_bounding_box = bbox;
 
     send_to_gpu(data, vertices, indices);
     m_render_data.emplace_back(data);
 }
 
-#if ENABLE_SINKING_CONTOURS
+void GLModel::init_from(const indexed_triangle_set& its)
+{
+    this->init_from(its, bounding_box(its));
+}
+
 void GLModel::init_from(const Polygons& polygons, float z)
 {
     auto append_polygon = [](const Polygon& polygon, float z, GUI::GLModel::InitializationData& data) {
@@ -137,7 +140,6 @@ void GLModel::init_from(const Polygons& polygons, float z)
     }
     init_from(init_data);
 }
-#endif // ENABLE_SINKING_CONTOURS
 
 bool GLModel::init_from_file(const std::string& filename)
 {
@@ -157,7 +159,8 @@ bool GLModel::init_from_file(const std::string& filename)
         return false;
     }
 
-    init_from(model.mesh());
+    TriangleMesh mesh = model.mesh();
+    init_from(mesh.its, mesh.bounding_box());
 
     m_filename = filename;
 
diff --git a/src/slic3r/GUI/GLModel.hpp b/src/slic3r/GUI/GLModel.hpp
index 7422466f0..f2fc9da9b 100644
--- a/src/slic3r/GUI/GLModel.hpp
+++ b/src/slic3r/GUI/GLModel.hpp
@@ -6,13 +6,13 @@
 #include <vector>
 #include <string>
 
+struct indexed_triangle_set;
+
 namespace Slic3r {
 
 class TriangleMesh;
-#if ENABLE_SINKING_CONTOURS
 class Polygon;
 using Polygons = std::vector<Polygon>;
-#endif // ENABLE_SINKING_CONTOURS
 
 namespace GUI {
 
@@ -70,10 +70,9 @@ namespace GUI {
         virtual ~GLModel() { reset(); }
 
         void init_from(const InitializationData& data);
-        void init_from(const TriangleMesh& mesh);
-#if ENABLE_SINKING_CONTOURS
+        void init_from(const indexed_triangle_set& its, const BoundingBoxf3& bbox);
+        void init_from(const indexed_triangle_set& its);
         void init_from(const Polygons& polygons, float z);
-#endif // ENABLE_SINKING_CONTOURS
         bool init_from_file(const std::string& filename);
 
         // if entity_id == -1 set the color of all entities
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index 515b6ed3a..86827442d 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -1143,6 +1143,10 @@ void GLToolbar::render_background(float left, float top, float right, float bott
 
 void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighted_item)
 {
+    // arrow texture not initialized
+    if (m_arrow_texture.texture.get_id() == 0)
+        return;
+
     float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();
     float factor = inv_zoom * m_layout.scale;
 
@@ -1157,6 +1161,7 @@ void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighte
     float left = m_layout.left;
     float top = m_layout.top - icon_stride;
 
+    bool found = false;
     for (const GLToolbarItem* item : m_items) {
         if (!item->is_visible())
             continue;
@@ -1164,20 +1169,21 @@ void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighte
         if (item->is_separator())
             left += separator_stride;
         else {   
-            if (item->get_name() == highlighted_item->get_name())
+            if (item->get_name() == highlighted_item->get_name()) {
+                found = true;
                 break;
+            }
             left += icon_stride;
         }
     }
+    if (!found)
+        return;
 
     left += border;
     top -= separator_stride;
     float right = left + scaled_icons_size;
 
     unsigned int tex_id = m_arrow_texture.texture.get_id();
-    // width and height of icon arrow is pointing to
-    float tex_width = (float)m_icons_texture.get_width();
-    float tex_height = (float)m_icons_texture.get_height();
     // arrow width and height
     float arr_tex_width = (float)m_arrow_texture.texture.get_width();
     float arr_tex_height = (float)m_arrow_texture.texture.get_height();
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index 59ccd9d66..023ba6f35 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -383,6 +383,9 @@ void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, cons
 
 		// the following line messes up the popup size the first time it is shown on wxWidgets 3.1.3
 //		comboCtrl->EnablePopupAnimation(false);
+#ifdef _WIN32
+		popup->SetFont(comboCtrl->GetFont());
+#endif // _WIN32
 		comboCtrl->SetPopupControl(popup);
 		wxString title = from_u8(text);
 		max_width = std::max(max_width, 60 + comboCtrl->GetTextExtent(title).x);
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index c8d8ad7b5..e787f97cb 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -70,6 +70,7 @@
 #include "SavePresetDialog.hpp"
 #include "PrintHostDialogs.hpp"
 #include "DesktopIntegrationDialog.hpp"
+#include "SendSystemInfoDialog.hpp"
 
 #include "BitmapCache.hpp"
 #include "Notebook.hpp"
@@ -429,9 +430,8 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension)
         /* FT_OBJ */     "OBJ files (*.obj)|*.obj;*.OBJ",
         /* FT_AMF */     "AMF files (*.amf)|*.zip.amf;*.amf;*.AMF;*.xml;*.XML",
         /* FT_3MF */     "3MF files (*.3mf)|*.3mf;*.3MF;",
-        /* FT_PRUSA */   "Prusa Control files (*.prusa)|*.prusa;*.PRUSA",
         /* FT_GCODE */   "G-code files (*.gcode, *.gco, *.g, *.ngc)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G;*.ngc;*.NGC",
-        /* FT_MODEL */   "Known files (*.stl, *.obj, *.amf, *.xml, *.3mf, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.3mf;*.3MF;*.prusa;*.PRUSA",
+        /* FT_MODEL */   "Known files (*.stl, *.obj, *.amf, *.xml, *.3mf, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.3mf;*.3MF",
         /* FT_PROJECT */ "Project files (*.3mf, *.amf)|*.3mf;*.3MF;*.amf;*.AMF",
         /* FT_FONTS */   "Font files (*.ttf, *.tte, *.ttc, *.dfont)|*.ttf;*.tte;*.ttc;*.dfont;*.TTF;*.TTE;*.TTC;*.DFONT",
         /* FT_GALLERY */ "Known files (*.stl, *.obj)|*.stl;*.STL;*.obj;*.OBJ",
@@ -683,6 +683,10 @@ void GUI_App::post_init()
         });
     }
 
+    // 'Send system info' dialog. Again, a CallAfter is needed on mac.
+    // Without it, GL extensions did not show.
+    CallAfter([] { show_send_system_info_dialog_if_needed(); });
+
 #ifdef _WIN32
     // Sets window property to mainframe so other instances can indentify it.
     OtherInstanceMessageHandler::init_windows_properties(mainframe, m_instance_hash_int);
@@ -696,7 +700,6 @@ GUI_App::GUI_App(EAppMode mode)
     , m_app_mode(mode)
     , m_em_unit(10)
     , m_imgui(new ImGuiWrapper())
-    , m_wizard(nullptr)
 	, m_removable_drive_manager(std::make_unique<RemovableDriveManager>())
 	, m_other_instance_message_handler(std::make_unique<OtherInstanceMessageHandler>())
 {
@@ -1335,8 +1338,6 @@ void GUI_App::recreate_GUI(const wxString& msg_name)
 
     dlg.Update(30, _L("Recreating") + dots);
     old_main_frame->Destroy();
-    // For this moment ConfigWizard is deleted, invalidate it.
-    m_wizard = nullptr;
 
     dlg.Update(80, _L("Loading of current presets") + dots);
     m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
@@ -1405,17 +1406,15 @@ void GUI_App::force_colors_update()
 void GUI_App::update_ui_from_settings()
 {
     update_label_colours();
-    mainframe->update_ui_from_settings();
-
 #ifdef _WIN32
+    // Upadte UU colors before Update UI from settings
     if (m_force_colors_update) {
         m_force_colors_update = false;
         mainframe->force_color_changed();
         mainframe->diff_dialog.force_color_changed();
-        if (m_wizard)
-            m_wizard->force_color_changed();
     }
 #endif
+    mainframe->update_ui_from_settings();
 }
 
 void GUI_App::persist_window_geometry(wxTopLevelWindow *window, bool default_maximized)
@@ -1873,8 +1872,9 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
 #endif
         case ConfigMenuTakeSnapshot:
             // Take a configuration snapshot.
-            if (check_and_save_current_preset_changes()) {
-                wxTextEntryDialog dlg(nullptr, _L("Taking configuration snapshot"), _L("Snapshot name"));
+            if (wxString action_name = _L("Taking a configuration snapshot");
+                check_and_save_current_preset_changes(action_name, _L("Some presets are modified and the unsaved changes will not be captured by the configuration snapshot."), false, true)) {
+                wxTextEntryDialog dlg(nullptr, action_name, _L("Snapshot name"));
                 UpdateDlgDarkUI(&dlg);
                 
                 // set current normal font for dialog children, 
@@ -1890,7 +1890,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
             }
             break;
         case ConfigMenuSnapshots:
-            if (check_and_save_current_preset_changes()) {
+            if (check_and_save_current_preset_changes(_L("Loading a configuration snapshot"), "", false)) {
                 std::string on_snapshot;
                 if (Config::SnapshotDB::singleton().is_on_snapshot(*app_config))
                     on_snapshot = app_config->get("on_snapshot");
@@ -1912,9 +1912,6 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
 
                         // Load the currently selected preset into the GUI, update the preset selection box.
                         load_current_presets();
-
-                        // update config wizard in respect to the new config
-                        update_wizard_from_config();
                     } catch (std::exception &ex) {
                         GUI::show_error(nullptr, _L("Failed to activate configuration snapshot.") + "\n" + into_u8(ex.what()));
                     }
@@ -2083,13 +2080,28 @@ std::vector<std::pair<unsigned int, std::string>> GUI_App::get_selected_presets(
     return ret;
 }
 
-// This is called when closing the application, when loading a config file or when starting the config wizard
-// to notify the user whether he is aware that some preset changes will be lost.
-bool GUI_App::check_and_save_current_preset_changes(const wxString& header, const wxString& caption)
+// To notify the user whether he is aware that some preset changes will be lost,
+// UnsavedChangesDialog: "Discard / Save / Cancel"
+// This is called when:
+// - Close Application & Current project isn't saved
+// - Load Project      & Current project isn't saved
+// - Undo / Redo with change of print technologie
+// - Loading snapshot
+// - Loading config_file/bundle
+// UnsavedChangesDialog: "Don't save / Save / Cancel"
+// This is called when:
+// - Exporting config_bundle
+// - Taking snapshot
+bool GUI_App::check_and_save_current_preset_changes(const wxString& caption, const wxString& header, bool remember_choice/* = true*/, bool dont_save_insted_of_discard/* = false*/)
 {
-    if (/*this->plater()->model().objects.empty() && */has_current_preset_changes()) {
-        UnsavedChangesDialog dlg(header, caption);
-        if (wxGetApp().app_config->get("default_action_on_close_application") == "none" && dlg.ShowModal() == wxID_CANCEL)
+    if (has_current_preset_changes()) {
+        const std::string app_config_key = remember_choice ? "default_action_on_close_application" : "";
+        int act_buttons = UnsavedChangesDialog::ActionButtons::SAVE;
+        if (dont_save_insted_of_discard)
+            act_buttons |= UnsavedChangesDialog::ActionButtons::DONT_SAVE;
+        UnsavedChangesDialog dlg(caption, header, app_config_key, act_buttons);
+        std::string act = app_config_key.empty() ? "none" : wxGetApp().app_config->get(app_config_key);
+        if (act == "none" && dlg.ShowModal() == wxID_CANCEL)
             return false;
 
         if (dlg.save_preset())  // save selected changes
@@ -2097,18 +2109,122 @@ bool GUI_App::check_and_save_current_preset_changes(const wxString& header, cons
             for (const std::pair<std::string, Preset::Type>& nt : dlg.get_names_and_types())
                 preset_bundle->save_changes_for_preset(nt.first, nt.second, dlg.get_unselected_options(nt.second));
 
+            load_current_presets(false);
+
             // if we saved changes to the new presets, we should to 
             // synchronize config.ini with the current selections.
             preset_bundle->export_selections(*app_config);
 
-            wxMessageBox(_L_PLURAL("The preset modifications are successfully saved", 
-                                   "The presets modifications are successfully saved", dlg.get_names_and_types().size()));
+            MessageDialog(nullptr, _L_PLURAL("The preset modifications are successfully saved", 
+                                             "The presets modifications are successfully saved", dlg.get_names_and_types().size())).ShowModal();
         }
     }
 
     return true;
 }
 
+void GUI_App::apply_keeped_preset_modifications()
+{
+    PrinterTechnology printer_technology = preset_bundle->printers.get_edited_preset().printer_technology();
+    for (Tab* tab : tabs_list) {
+        if (tab->supports_printer_technology(printer_technology))
+            tab->apply_config_from_cache();
+    }
+    load_current_presets(false);
+}
+
+// This is called when creating new project or load another project
+// OR close ConfigWizard
+// to ask the user what should we do with unsaved changes for presets.
+// New Project          => Current project is saved    => UnsavedChangesDialog: "Keep / Discard / Cancel"
+//                      => Current project isn't saved => UnsavedChangesDialog: "Keep / Discard / Save / Cancel"
+// Close ConfigWizard   => Current project is saved    => UnsavedChangesDialog: "Keep / Discard / Save / Cancel"
+// Note: no_nullptr postponed_apply_of_keeped_changes indicates that thie function is called after ConfigWizard is closed
+bool GUI_App::check_and_keep_current_preset_changes(const wxString& caption, const wxString& header, int action_buttons, bool* postponed_apply_of_keeped_changes/* = nullptr*/)
+{
+    if (has_current_preset_changes()) {
+        bool is_called_from_configwizard = postponed_apply_of_keeped_changes != nullptr;
+
+        const std::string app_config_key = is_called_from_configwizard ? "" : "default_action_on_new_project";
+        UnsavedChangesDialog dlg(caption, header, app_config_key, action_buttons);
+        std::string act = app_config_key.empty() ? "none" : wxGetApp().app_config->get(app_config_key);
+        if (act == "none" && dlg.ShowModal() == wxID_CANCEL)
+            return false;
+
+        auto reset_modifications = [this, is_called_from_configwizard]() {
+            if (is_called_from_configwizard)
+                return; // no need to discared changes. It will be done fromConfigWizard closing
+
+            PrinterTechnology printer_technology = preset_bundle->printers.get_edited_preset().printer_technology();
+            for (const Tab* const tab : tabs_list) {
+                if (tab->supports_printer_technology(printer_technology) && tab->current_preset_is_dirty())
+                    tab->m_presets->discard_current_changes();
+            }
+            load_current_presets(false);
+        };
+
+        if (dlg.discard())
+            reset_modifications();
+        else  // save selected changes
+        {
+            const auto& preset_names_and_types = dlg.get_names_and_types();
+            if (dlg.save_preset()) {
+                for (const std::pair<std::string, Preset::Type>& nt : preset_names_and_types)
+                    preset_bundle->save_changes_for_preset(nt.first, nt.second, dlg.get_unselected_options(nt.second));
+
+                // if we saved changes to the new presets, we should to 
+                // synchronize config.ini with the current selections.
+                preset_bundle->export_selections(*app_config);
+
+                wxString text = _L_PLURAL("The preset modifications are successfully saved",
+                    "The presets modifications are successfully saved", preset_names_and_types.size());
+                if (!is_called_from_configwizard)
+                    text += "\n\n" + _L("For new project all modifications will be reseted");
+
+                MessageDialog(nullptr, text).ShowModal();
+                reset_modifications();
+            }
+            else if (dlg.transfer_changes() && (dlg.has_unselected_options() || is_called_from_configwizard)) {
+                // execute this part of code only if not all modifications are keeping to the new project 
+                // OR this function is called when ConfigWizard is closed and "Keep modifications" is selected
+                for (const std::pair<std::string, Preset::Type>& nt : preset_names_and_types) {
+                    Preset::Type type = nt.second;
+                    Tab* tab = get_tab(type);
+                    std::vector<std::string> selected_options = dlg.get_selected_options(type);
+                    if (type == Preset::TYPE_PRINTER) {
+                        auto it = std::find(selected_options.begin(), selected_options.end(), "extruders_count");
+                        if (it != selected_options.end()) {
+                            // erase "extruders_count" option from the list
+                            selected_options.erase(it);
+                            // cache the extruders count
+                            static_cast<TabPrinter*>(tab)->cache_extruder_cnt();
+                        }
+                    }
+                    tab->cache_config_diff(selected_options);
+                    if (!is_called_from_configwizard)
+                        tab->m_presets->discard_current_changes();
+                }
+                if (is_called_from_configwizard)
+                    *postponed_apply_of_keeped_changes = true;
+                else
+                    apply_keeped_preset_modifications();
+            }
+        }
+    }
+
+    return true;
+}
+
+bool GUI_App::can_load_project()
+{
+    int saved_project = plater()->save_project_if_dirty(_L("Loading a new project while the current project is modified."));
+    if (saved_project == wxID_CANCEL ||
+        (plater()->is_project_dirty() && saved_project == wxID_NO && 
+         !check_and_save_current_preset_changes(_L("Project is loading"), _L("Loading a new project while some presets are modified."))))
+        return false;
+    return true;
+}
+
 bool GUI_App::check_print_host_queue()
 {
     wxString dirty;
@@ -2166,17 +2282,6 @@ void GUI_App::load_current_presets(bool check_printer_presets_ /*= true*/)
 		}
 }
 
-void GUI_App::update_wizard_from_config()
-{
-    if (!m_wizard)
-        return;
-    // If ConfigWizard was created before changing of the configuration,
-    // we have to destroy it to have possibility to create it again in respect to the new config's parameters
-    m_wizard->Reparent(nullptr);
-    m_wizard->Destroy();
-    m_wizard = nullptr;
-}
-
 bool GUI_App::OnExceptionInMainLoop()
 {
     generic_exception_handle();
@@ -2281,7 +2386,7 @@ wxBookCtrlBase* GUI_App::tab_panel() const
     return mainframe->m_tabpanel;
 }
 
-std::shared_ptr<NotificationManager> GUI_App::notification_manager() 
+NotificationManager * GUI_App::notification_manager()
 {
     return plater_->get_notification_manager();
 }
@@ -2333,35 +2438,38 @@ void GUI_App::open_web_page_localized(const std::string &http_address)
     open_browser_with_warning_dialog(http_address + "&lng=" + this->current_language_code_safe());
 }
 
+// If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have a part(s).
+// Because of we can't to print the multi-part objects with SLA technology.
+bool GUI_App::may_switch_to_SLA_preset(const wxString& caption)
+{
+    if (model_has_multi_part_objects(model())) {
+        show_info(nullptr,
+            _L("It's impossible to print multi-part object(s) with SLA technology.") + "\n\n" +
+            _L("Please check your object list before preset changing."),
+            caption);
+        return false;
+    }
+    return true;
+}
+
 bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page)
 {
     wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null");
 
     if (reason == ConfigWizard::RR_USER) {
-        wxString header = _L("Updates to Configuration Wizard may cause an another preset selection and lost of preset modification as a result.\n"
-                             "So, check unsaved changes and save them if necessary.") + "\n";
-        if (!check_and_save_current_preset_changes(header, _L("ConfigWizard is opening")) ||
-            preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::FORCED_BEFORE_WIZARD) == PresetUpdater::R_ALL_CANCELED)
+        if (preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::FORCED_BEFORE_WIZARD) == PresetUpdater::R_ALL_CANCELED)
             return false;
     }
 
-    if (! m_wizard) {
-        wxBusyCursor wait;
-        m_wizard = new ConfigWizard(mainframe);
-    }
-
-    const bool res = m_wizard->run(reason, start_page);
+    auto wizard = new ConfigWizard(mainframe);
+    const bool res = wizard->run(reason, start_page);
 
     if (res) {
         load_current_presets();
 
-        if (preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA
-            && Slic3r::model_has_multi_part_objects(wxGetApp().model())) {
-            GUI::show_info(nullptr,
-                _L("It's impossible to print multi-part object(s) with SLA technology.") + "\n\n" +
-                _L("Please check and fix your object list."),
-                _L("Attention!"));
-        }
+        // #ysFIXME - delete after testing: This part of code looks redundant. All checks are inside ConfigWizard::priv::apply_config() 
+        if (preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA)
+            may_switch_to_SLA_preset(_L("Configuration is editing from ConfigWizard"));
     }
 
     return res;
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index c7b9081ce..7d6e11f54 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -55,7 +55,6 @@ enum FileType
     FT_OBJ,
     FT_AMF,
     FT_3MF,
-    FT_PRUSA,
     FT_GCODE,
     FT_MODEL,
     FT_PROJECT,
@@ -152,7 +151,6 @@ private:
 
     std::unique_ptr<ImGuiWrapper> m_imgui;
     std::unique_ptr<PrintHostJobQueue> m_printhost_job_queue;
-    ConfigWizard* m_wizard;    // Managed by wxWindow tree
 	std::unique_ptr <OtherInstanceMessageHandler> m_other_instance_message_handler;
     std::unique_ptr <wxSingleInstanceChecker> m_single_instance_checker;
     std::string m_instance_hash_string;
@@ -248,11 +246,13 @@ public:
     bool            has_current_preset_changes() const;
     void            update_saved_preset_from_current_preset();
     std::vector<std::pair<unsigned int, std::string>> get_selected_presets() const;
-    bool            check_and_save_current_preset_changes(const wxString& header = wxString(), const wxString& caption = wxString());
+    bool            check_and_save_current_preset_changes(const wxString& caption, const wxString& header, bool remember_choice = true, bool use_dont_save_insted_of_discard = false);
+    void            apply_keeped_preset_modifications();
+    bool            check_and_keep_current_preset_changes(const wxString& caption, const wxString& header, int action_buttons, bool* postponed_apply_of_keeped_changes = nullptr);
+    bool            can_load_project();
     bool            check_print_host_queue();
     bool            checked_tab(Tab* tab);
     void            load_current_presets(bool check_printer_presets = true);
-    void            update_wizard_from_config();
 
     wxString        current_language_code() const { return m_wxLocale->GetCanonicalName(); }
 	// Translate the language code to a code, for which Prusa Research maintains translations. Defaults to "en_US".
@@ -277,7 +277,7 @@ public:
     ObjectLayers*        obj_layers();
     Plater*              plater();
     Model&      		 model();
-    std::shared_ptr<NotificationManager> notification_manager();
+    NotificationManager * notification_manager();
 
     // Parameters extracted from the command line to be passed to GUI after initialization.
     GUI_InitParams* init_params { nullptr };
@@ -310,6 +310,7 @@ public:
     PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); }
 
     void            open_web_page_localized(const std::string &http_address);
+    bool            may_switch_to_SLA_preset(const wxString& caption);
     bool            run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page = ConfigWizard::SP_WELCOME);
     void            show_desktop_integration_dialog();
 
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 5d42b6afe..1c3e05365 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -705,7 +705,7 @@ wxMenuItem* MenuFactory::append_menu_item_fix_through_netfabb(wxMenu* menu)
         return nullptr;
     wxMenuItem* menu_item = append_menu_item(menu, wxID_ANY, _L("Fix through the Netfabb"), "",
         [](wxCommandEvent&) { obj_list()->fix_through_netfabb(); }, "", menu,
-        []() {return plater()->can_fix_through_netfabb(); }, plater());
+        []() {return plater()->can_fix_through_netfabb(); }, m_parent);
 
     return menu_item;
 }
@@ -714,7 +714,7 @@ wxMenuItem* MenuFactory::append_menu_item_simplify(wxMenu* menu)
 {
     wxMenuItem* menu_item = append_menu_item(menu, wxID_ANY, _L("Simplify model"), "",
         [](wxCommandEvent&) { obj_list()->simplify(); }, "", menu,
-        []() {return plater()->can_simplify(); }, plater());
+        []() {return plater()->can_simplify(); }, m_parent);
     menu->AppendSeparator();
 
     return menu_item;
@@ -795,7 +795,7 @@ void MenuFactory::append_menu_item_change_extruder(wxMenu* menu)
     }
 
     append_submenu(menu, extruder_selection_menu, wxID_ANY, name, _L("Use another extruder"),
-        "edit_uni"/* : "change_extruder"*/, []() {return true; }, GUI::wxGetApp().plater());
+        "edit_uni"/* : "change_extruder"*/, []() {return true; }, m_parent);
 
 //    menu->AppendSubMenu(extruder_selection_menu, name);
 }
@@ -1098,6 +1098,7 @@ wxMenu* MenuFactory::multi_selection_menu()
 
     wxMenu* menu = new MenuWithSeparators();
 
+    append_menu_item_fix_through_netfabb(menu);
     append_menu_item_reload_from_disk(menu);
     append_menu_items_convert_unit(menu);
     if (obj_list()->can_merge_to_multipart_object())
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 378f91cbc..d2a6b6e9a 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -10,6 +10,7 @@
 #include "BitmapComboBox.hpp"
 #include "GalleryDialog.hpp"
 #include "MainFrame.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 #include "OptionsGroup.hpp"
 #include "Tab.hpp"
@@ -19,6 +20,7 @@
 #include "Selection.hpp"
 #include "format.hpp"
 #include "NotificationManager.hpp"
+#include "MsgDialog.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <wx/progdlg.h>
@@ -369,60 +371,90 @@ void ObjectList::get_selection_indexes(std::vector<int>& obj_idxs, std::vector<i
         }
     }
 
-    std::sort(obj_idxs.begin(), obj_idxs.end(), std::greater<int>());
+    std::sort(obj_idxs.begin(), obj_idxs.end(), std::less<int>());
     obj_idxs.erase(std::unique(obj_idxs.begin(), obj_idxs.end()), obj_idxs.end());
 }
 
-int ObjectList::get_mesh_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
+int ObjectList::get_repaired_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
 {
-    if (obj_idx < 0)
-        return 0;
-
-    return (*m_objects)[obj_idx]->get_mesh_errors_count(vol_idx);
+    return obj_idx >= 0 ? (*m_objects)[obj_idx]->get_repaired_errors_count(vol_idx) : 0;
 }
 
-wxString ObjectList::get_mesh_errors_list(const int obj_idx, const int vol_idx /*= -1*/) const
-{    
-    const int errors = get_mesh_errors_count(obj_idx, vol_idx);
+static std::string get_warning_icon_name(const TriangleMeshStats& stats)
+{
+    return stats.manifold() ? (stats.repaired() ? "exclamation_manifold" : "") : "exclamation";
+}
 
-    if (errors == 0)
-        return ""; // hide tooltip
+MeshErrorsInfo ObjectList::get_mesh_errors_info(const int obj_idx, const int vol_idx /*= -1*/, wxString* sidebar_info /*= nullptr*/) const
+{    
+    if (obj_idx < 0)
+        return { {}, {} }; // hide tooltip
+
+    const TriangleMeshStats& stats = vol_idx == -1 ?
+        (*m_objects)[obj_idx]->get_object_stl_stats() :
+        (*m_objects)[obj_idx]->volumes[vol_idx]->mesh().stats();
+
+    if (!stats.repaired() && stats.manifold()) {
+        if (sidebar_info)
+            *sidebar_info = _L("No errors detected");
+        return { {}, {} }; // hide tooltip
+    }
+
+    wxString tooltip, auto_repaired_info, remaining_info;
 
     // Create tooltip string, if there are errors 
-    wxString tooltip = format_wxstr(_L_PLURAL("Auto-repaired %1$d error", "Auto-repaired %1$d errors", errors), errors) + ":\n";
+    if (stats.repaired()) {
+        const int errors = get_repaired_errors_count(obj_idx, vol_idx);
+        auto_repaired_info = format_wxstr(_L_PLURAL("Auto-repaired %1$d error", "Auto-repaired %1$d errors", errors), errors);
+        tooltip += auto_repaired_info +":\n";
 
-    const stl_stats& stats = vol_idx == -1 ?
-                            (*m_objects)[obj_idx]->get_object_stl_stats() :
-                            (*m_objects)[obj_idx]->volumes[vol_idx]->mesh().stl.stats;
+        const RepairedMeshErrors& repaired = stats.repaired_errors;
 
-    if (stats.degenerate_facets > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d degenerate facet", "%1$d degenerate facets", stats.degenerate_facets), stats.degenerate_facets) + "\n";
-    if (stats.edges_fixed > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d edge fixed", "%1$d edges fixed", stats.edges_fixed), stats.edges_fixed) + "\n";
-    if (stats.facets_removed > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d facet removed", "%1$d facets removed", stats.facets_removed), stats.facets_removed) + "\n";
-    if (stats.facets_added > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d facet added", "%1$d facets added", stats.facets_added), stats.facets_added) + "\n";
-    if (stats.facets_reversed > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d facet reversed", "%1$d facets reversed", stats.facets_reversed), stats.facets_reversed) + "\n";
-    if (stats.backwards_edges > 0)
-        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d backwards edge", "%1$d backwards edges", stats.backwards_edges), stats.backwards_edges) + "\n";
+        if (repaired.degenerate_facets > 0)
+            tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d degenerate facet", "%1$d degenerate facets", repaired.degenerate_facets), repaired.degenerate_facets) + "\n";
+        if (repaired.edges_fixed > 0)
+            tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d edge fixed", "%1$d edges fixed", repaired.edges_fixed), repaired.edges_fixed) + "\n";
+        if (repaired.facets_removed > 0)
+            tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d facet removed", "%1$d facets removed", repaired.facets_removed), repaired.facets_removed) + "\n";
+        if (repaired.facets_reversed > 0)
+            tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d facet reversed", "%1$d facets reversed", repaired.facets_reversed), repaired.facets_reversed) + "\n";
+        if (repaired.backwards_edges > 0)
+            tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d backwards edge", "%1$d backwards edges", repaired.backwards_edges), repaired.backwards_edges) + "\n";
+    }
+    if (!stats.manifold()) {
+        remaining_info = format_wxstr(_L_PLURAL("Remaining %1$d open edge", "Remaining %1$d open edges", stats.open_edges), stats.open_edges);
 
-    if (is_windows10())
-        tooltip += _L("Right button click the icon to fix STL through Netfabb");
+        tooltip += _L("Remaning errors") + ":\n";
+        tooltip += "\t" + format_wxstr(_L_PLURAL("%1$d open edge", "%1$d open edges", stats.open_edges), stats.open_edges) + "\n";
+    }
 
-    return tooltip;
+    if (sidebar_info)
+        *sidebar_info = stats.manifold() ? auto_repaired_info : (remaining_info + (stats.repaired() ? ("\n" + auto_repaired_info) : ""));
+
+    if (is_windows10() && !sidebar_info)
+        tooltip += "\n" + _L("Right button click the icon to fix STL through Netfabb");
+
+    return { tooltip, get_warning_icon_name(stats) };
 }
 
-wxString ObjectList::get_mesh_errors_list()
+MeshErrorsInfo ObjectList::get_mesh_errors_info(wxString* sidebar_info /*= nullptr*/)
 {
-    if (!GetSelection())
-        return "";
+    wxDataViewItem item = GetSelection();
+    if (!item)
+        return { "", "" };
 
     int obj_idx, vol_idx;
     get_selected_item_indexes(obj_idx, vol_idx);
 
-    return get_mesh_errors_list(obj_idx, vol_idx);
+    if (obj_idx < 0) { // child of ObjectItem is selected
+        if (sidebar_info)
+            obj_idx = m_objects_model->GetObjectIdByItem(item);
+        else
+            return { "", "" };
+    }
+    assert(obj_idx >= 0);
+
+    return get_mesh_errors_info(obj_idx, vol_idx, sidebar_info);
 }
 
 void ObjectList::set_tooltip_for_item(const wxPoint& pt)
@@ -458,9 +490,12 @@ void ObjectList::set_tooltip_for_item(const wxPoint& pt)
 #endif //__WXMSW__
     else if (col->GetTitle() == _("Name") && (pt.x >= 2 * wxGetApp().em_unit() && pt.x <= 4 * wxGetApp().em_unit()))
     {
-        int obj_idx, vol_idx;
-        get_selected_item_indexes(obj_idx, vol_idx, item);
-        tooltip = get_mesh_errors_list(obj_idx, vol_idx);
+        if (const ItemType type = m_objects_model->GetItemType(item); 
+            type & (itObject | itVolume)) {
+            int obj_idx = m_objects_model->GetObjectIdByItem(item);
+            int vol_idx = type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
+            tooltip = get_mesh_errors_info(obj_idx, vol_idx).tooltip;
+        }
     }
     
     GetMainWindow()->SetToolTip(tooltip);
@@ -886,7 +921,7 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me
 	            int obj_idx, vol_idx;
 	            get_selected_item_indexes(obj_idx, vol_idx, item);
 
-	            if (get_mesh_errors_count(obj_idx, vol_idx) > 0 && 
+	            if (m_objects_model->HasWarningIcon(item) &&
 	                mouse_pos.x > 2 * wxGetApp().em_unit() && mouse_pos.x < 4 * wxGetApp().em_unit())
 	                fix_through_netfabb();
 	        }
@@ -1534,7 +1569,6 @@ void ObjectList::load_modifier(ModelObject& model_object, std::vector<ModelVolum
         }
 
         TriangleMesh mesh = model.mesh();
-        mesh.repair();
         // Mesh will be centered when loading.
         ModelVolume* new_volume = model_object.add_volume(std::move(mesh), type);
         new_volume->name = boost::filesystem::path(input_file).filename().string();
@@ -1557,27 +1591,24 @@ void ObjectList::load_modifier(ModelObject& model_object, std::vector<ModelVolum
 
 static TriangleMesh create_mesh(const std::string& type_name, const BoundingBoxf3& bb)
 {
-    TriangleMesh mesh;
-
     const double side = wxGetApp().plater()->canvas3D()->get_size_proportional_to_max_bed_size(0.1);
 
+    indexed_triangle_set mesh;
     if (type_name == "Box")
         // Sitting on the print bed, left front front corner at (0, 0).
-        mesh = make_cube(side, side, side);
+        mesh = its_make_cube(side, side, side);
     else if (type_name == "Cylinder")
         // Centered around 0, sitting on the print bed.
         // The cylinder has the same volume as the box above.
-        mesh = make_cylinder(0.564 * side, side);
+        mesh = its_make_cylinder(0.564 * side, side);
     else if (type_name == "Sphere")
         // Centered around 0, half the sphere below the print bed, half above.
         // The sphere has the same volume as the box above.
-        mesh = make_sphere(0.62 * side, PI / 18);
+        mesh = its_make_sphere(0.62 * side, PI / 18);
     else if (type_name == "Slab")
         // Sitting on the print bed, left front front corner at (0, 0).
-        mesh = make_cube(bb.size().x() * 1.5, bb.size().y() * 1.5, bb.size().z() * 0.5);
-    mesh.repair();
-
-    return mesh;
+        mesh = its_make_cube(bb.size().x() * 1.5, bb.size().y() * 1.5, bb.size().z() * 0.5);
+    return TriangleMesh(mesh);
 }
 
 void ObjectList::load_generic_subobject(const std::string& type_name, const ModelVolumeType type)
@@ -1780,8 +1811,10 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
         return;
 
     // If last volume item with warning was deleted, unmark object item
-    if (type & itVolume && (*m_objects)[obj_idx]->get_mesh_errors_count() == 0)
-        m_objects_model->DeleteWarningIcon(parent);
+    if (type & itVolume) {
+        const std::string& icon_name = get_warning_icon_name(object(obj_idx)->get_object_stl_stats());
+        m_objects_model->UpdateWarningIcon(parent, icon_name);
+    }
 
     m_objects_model->Delete(item);
     update_info_items(obj_idx);
@@ -1990,7 +2023,7 @@ void ObjectList::split()
     for (const ModelVolume* volume : model_object->volumes) {
         const wxDataViewItem& vol_item = m_objects_model->AddVolumeChild(parent, from_u8(volume->name),
             volume->type(),// is_modifier() ? ModelVolumeType::PARAMETER_MODIFIER : ModelVolumeType::MODEL_PART,
-            volume->get_mesh_errors_count()>0,
+            get_warning_icon_name(volume->mesh().stats()),
             volume->config.has("extruder") ? volume->config.extruder() : 0,
             false);
         // add settings to the part, if it has those
@@ -2489,7 +2522,7 @@ void ObjectList::part_selection_changed()
         if (item) {
             // wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item));
             wxGetApp().obj_manipul()->update_item_name(m_objects_model->GetName(item));
-            wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_list(obj_idx, volume_id));
+            wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_info(obj_idx, volume_id));
         }
     }
 
@@ -2632,7 +2665,7 @@ void ObjectList::add_object_to_list(size_t obj_idx, bool call_selection_changed)
     const wxString& item_name = from_u8(model_object->name);
     const auto item = m_objects_model->Add(item_name,
                       model_object->config.has("extruder") ? model_object->config.extruder() : 0,
-                      get_mesh_errors_count(obj_idx) > 0);
+                      get_warning_icon_name(model_object->mesh().stats()));
 
     update_info_items(obj_idx, nullptr, call_selection_changed);
 
@@ -2642,7 +2675,7 @@ void ObjectList::add_object_to_list(size_t obj_idx, bool call_selection_changed)
             const wxDataViewItem& vol_item = m_objects_model->AddVolumeChild(item,
                 from_u8(volume->name),
                 volume->type(),
-                volume->get_mesh_errors_count()>0,
+                get_warning_icon_name(volume->mesh().stats()),
                 volume->config.has("extruder") ? volume->config.extruder() : 0,
                 false);
             add_settings_item(vol_item, &volume->config.get());
@@ -2749,8 +2782,7 @@ void ObjectList::delete_from_model_and_list(const std::vector<ItemForDelete>& it
                         m_objects_model->SetExtruder(extruder, parent);
                     }
                     // If last volume item with warning was deleted, unmark object item
-                    if (obj->get_mesh_errors_count() == 0)
-                        m_objects_model->DeleteWarningIcon(parent);
+                    m_objects_model->UpdateWarningIcon(parent, get_warning_icon_name(obj->get_object_stl_stats()));
                 }
                 wxGetApp().plater()->canvas3D()->ensure_on_bed(item->obj_idx, printer_technology() != ptSLA);
             }
@@ -3458,7 +3490,7 @@ void ObjectList::update_selections_on_canvas()
         volume_idxs = selection.get_missing_volume_idxs_from(volume_idxs);
         if (volume_idxs.size() > 0)
         {
-            Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Selection-Remove from list")));
+            Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Selection-Remove from list")), UndoRedo::SnapshotType::Selection);
             selection.remove_volumes(mode, volume_idxs);
         }
     }
@@ -3470,7 +3502,7 @@ void ObjectList::update_selections_on_canvas()
         // OR there is no single selection
         if (selection.get_mode() == mode || !single_selection) 
             volume_idxs = selection.get_unselected_volume_idxs_from(volume_idxs);
-        Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Selection-Add from list")));
+        Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Selection-Add from list")), UndoRedo::SnapshotType::Selection);
         selection.add_volumes(mode, volume_idxs, single_selection);
     }
 
@@ -4013,13 +4045,128 @@ void ObjectList::rename_item()
 
 void ObjectList::fix_through_netfabb() 
 {
-    int obj_idx, vol_idx;
-    get_selected_item_indexes(obj_idx, vol_idx);
+    // Do not fix anything when a gizmo is open. There might be issues with updates
+    // and what is worse, the snapshot time would refer to the internal stack.
+    if (!wxGetApp().plater()->canvas3D()->get_gizmos_manager().check_gizmos_closed_except(GLGizmosManager::Undefined))
+        return;
 
-    wxGetApp().plater()->fix_through_netfabb(obj_idx, vol_idx);
-    
-    update_item_error_icon(obj_idx, vol_idx);
-    update_info_items(obj_idx);
+    //          model_name
+    std::vector<std::string>                           succes_models;
+    //                   model_name     failing reason
+    std::vector<std::pair<std::string, std::string>>   failed_models;
+
+    std::vector<int> obj_idxs, vol_idxs;
+    get_selection_indexes(obj_idxs, vol_idxs);
+
+    std::vector<std::string> model_names;
+
+    // clear selections from the non-broken models if any exists
+    // and than fill names of models to repairing 
+    if (vol_idxs.empty()) {
+#if !FIX_THROUGH_NETFABB_ALWAYS
+        for (int i = int(obj_idxs.size())-1; i >= 0; --i)
+                if (object(obj_idxs[i])->get_repaired_errors_count() == 0)
+                    obj_idxs.erase(obj_idxs.begin()+i);
+#endif // FIX_THROUGH_NETFABB_ALWAYS
+        for (int obj_idx : obj_idxs)
+            model_names.push_back(object(obj_idx)->name);
+    }
+    else {
+        ModelObject* obj = object(obj_idxs.front());
+#if !FIX_THROUGH_NETFABB_ALWAYS
+        for (int i = int(vol_idxs.size()) - 1; i >= 0; --i)
+            if (obj->get_repaired_errors_count(vol_idxs[i]) == 0)
+                vol_idxs.erase(vol_idxs.begin() + i);
+#endif // FIX_THROUGH_NETFABB_ALWAYS
+        for (int vol_idx : vol_idxs)
+            model_names.push_back(obj->volumes[vol_idx]->name);
+    }
+
+    auto plater = wxGetApp().plater();
+
+    auto fix_and_update_progress = [this, plater, model_names](const int obj_idx, const int vol_idx,
+                                          int model_idx,
+                                          wxProgressDialog& progress_dlg,
+                                          std::vector<std::string>& succes_models,
+                                          std::vector<std::pair<std::string, std::string>>& failed_models)
+    {
+        const std::string& model_name = model_names[model_idx];
+        wxString msg = _L("Repairing model");
+        if (model_names.size() == 1)
+            msg += ": " + from_u8(model_name) + "\n";
+        else {
+            msg += ":\n";
+            for (int i = 0; i < int(model_names.size()); ++i)
+                msg += (i == model_idx ? " > " : "   ") + from_u8(model_names[i]) + "\n";
+            msg += "\n";
+        }
+
+        plater->clear_before_change_mesh(obj_idx);
+        std::string res;
+        if (!fix_model_by_win10_sdk_gui(*(object(obj_idx)), vol_idx, progress_dlg, msg, res))
+            return false;
+        wxGetApp().plater()->changed_mesh(obj_idx);
+
+        plater->changed_mesh(obj_idx);
+
+        if (res.empty())
+            succes_models.push_back(model_name);
+        else
+            failed_models.push_back({ model_name, res });
+
+        update_item_error_icon(obj_idx, vol_idx);
+        update_info_items(obj_idx);
+
+        return true;
+    };
+
+    Plater::TakeSnapshot snapshot(plater, _L("Fix through NetFabb"));
+
+    // Open a progress dialog.
+    wxProgressDialog progress_dlg(_L("Fixing through NetFabb"), "", 100,
+                                    nullptr, // ! parent of the wxProgressDialog should be nullptr to avoid flickering during the model fixing
+                                    wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
+    int model_idx{ 0 };
+    if (vol_idxs.empty()) {
+        int vol_idx{ -1 };
+        for (int obj_idx : obj_idxs) {
+#if !FIX_THROUGH_NETFABB_ALWAYS
+            if (object(obj_idx)->get_repaired_errors_count(vol_idx) == 0)
+                continue;
+#endif // FIX_THROUGH_NETFABB_ALWAYS
+            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
+                break;
+            model_idx++;
+        }
+    }
+    else {
+        int obj_idx{ obj_idxs.front() };
+        for (int vol_idx : vol_idxs) {
+            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
+                break;
+            model_idx++;
+        }
+    }
+    // Close the progress dialog
+    progress_dlg.Update(100, "");
+
+    // Show info notification
+    wxString msg;
+    wxString bullet_suf = "\n   - ";
+    if (!succes_models.empty()) {
+        msg = _L_PLURAL("Folowing model is repaired successfully", "Folowing models are repaired successfully", succes_models.size()) + ":";
+        for (auto& model : succes_models)
+            msg += bullet_suf + from_u8(model);
+        msg += "\n\n";
+    }
+    if (!failed_models.empty()) {
+        msg += _L_PLURAL("Folowing model repair failed", "Folowing models repair failed", failed_models.size()) + ":\n";
+        for (auto& model : failed_models)
+            msg += bullet_suf + from_u8(model.first) + ": " + _(model.second);
+    }
+    if (msg.IsEmpty())
+        msg = _L("Repairing was canceled");
+    plater->get_notification_manager()->push_notification(NotificationType::NetfabbFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, boost::nowide::narrow(msg));
 }
 
 void ObjectList::simplify()
@@ -4041,23 +4188,19 @@ void ObjectList::simplify()
 
 void ObjectList::update_item_error_icon(const int obj_idx, const int vol_idx) const 
 {
-    const wxDataViewItem item = vol_idx <0 ? m_objects_model->GetItemById(obj_idx) :
-                                m_objects_model->GetItemByVolumeId(obj_idx, vol_idx);
-    if (!item)
+    auto obj = object(obj_idx);
+    if (wxDataViewItem obj_item = m_objects_model->GetItemById(obj_idx)) {
+        const std::string& icon_name = get_warning_icon_name(obj->get_object_stl_stats());
+        m_objects_model->UpdateWarningIcon(obj_item, icon_name);
+    }
+
+    if (vol_idx < 0)
         return;
 
-    if (get_mesh_errors_count(obj_idx, vol_idx) == 0)
-    {
-        // if whole object has no errors more,
-        if (get_mesh_errors_count(obj_idx) == 0)
-            // unmark all items in the object
-            m_objects_model->DeleteWarningIcon(vol_idx >= 0 ? m_objects_model->GetParent(item) : item, true);
-        else
-            // unmark fixed item only
-            m_objects_model->DeleteWarningIcon(item);
+    if (wxDataViewItem vol_item = m_objects_model->GetItemByVolumeId(obj_idx, vol_idx)) {
+        const std::string& icon_name = get_warning_icon_name(obj->volumes[vol_idx]->mesh().stats());
+        m_objects_model->UpdateWarningIcon(vol_item, icon_name);
     }
-    else
-        m_objects_model->AddWarningIcon(item);
 }
 
 void ObjectList::msw_rescale()
@@ -4188,7 +4331,7 @@ wxDataViewItemArray ObjectList::reorder_volumes_and_get_selection(int obj_idx, s
     for (const ModelVolume* volume : object->volumes) {
         wxDataViewItem vol_item = m_objects_model->AddVolumeChild(object_item, from_u8(volume->name),
             volume->type(),
-            volume->get_mesh_errors_count() > 0,
+            get_warning_icon_name(volume->mesh().stats()),
             volume->config.has("extruder") ? volume->config.extruder() : 0,
             false);
         // add settings to the part, if it has those
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 0fbad1919..cc619fc45 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -36,6 +36,9 @@ typedef double                                      coordf_t;
 typedef std::pair<coordf_t, coordf_t>               t_layer_height_range;
 typedef std::map<t_layer_height_range, ModelConfig> t_layer_config_ranges;
 
+// Manifold mesh may contain self-intersections, so we want to always allow fixing the mesh.
+#define FIX_THROUGH_NETFABB_ALWAYS 1
+
 namespace GUI {
 
 wxDECLARE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);
@@ -64,6 +67,12 @@ struct ItemForDelete
     }
 };
 
+struct MeshErrorsInfo 
+{
+    wxString    tooltip;
+    std::string warning_icon_name;
+};
+
 class ObjectList : public wxDataViewCtrl
 {
 public:
@@ -209,13 +218,13 @@ public:
     void                get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& item = wxDataViewItem(0));
     void                get_selection_indexes(std::vector<int>& obj_idxs, std::vector<int>& vol_idxs);
     // Get count of errors in the mesh
-    int                 get_mesh_errors_count(const int obj_idx, const int vol_idx = -1) const;
-    /* Get list of errors in the mesh. Return value is a string, used for the tooltip
-     * Function without parameters is for a call from Manipulation panel, 
-     * when we don't know parameters of selected item 
-     */
-    wxString            get_mesh_errors_list(const int obj_idx, const int vol_idx = -1) const;
-    wxString            get_mesh_errors_list();
+    int                 get_repaired_errors_count(const int obj_idx, const int vol_idx = -1) const;
+    // Get list of errors in the mesh and name of the warning icon 
+    // Return value is a pair <Tooltip, warning_icon_name>, used for the tooltip and related warning icon
+    // Function without parameters is for a call from Manipulation panel, 
+    // when we don't know parameters of selected item 
+    MeshErrorsInfo      get_mesh_errors_info(const int obj_idx, const int vol_idx = -1, wxString* sidebar_info = nullptr) const;
+    MeshErrorsInfo      get_mesh_errors_info(wxString* sidebar_info = nullptr);
     void                set_tooltip_for_item(const wxPoint& pt);
 
     void                selection_changed();
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index d35def196..b8c053f88 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1,5 +1,4 @@
 #include "GUI_ObjectManipulation.hpp"
-#include "GUI_ObjectList.hpp"
 #include "I18N.hpp"
 #include "BitmapComboBox.hpp"
 
@@ -132,7 +131,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
                     return;
 
                 wxGetApp().obj_list()->fix_through_netfabb();
-                update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list());
+                update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_info());
             });
 
     sizer->Add(m_fix_throught_netfab_bitmap);
@@ -497,14 +496,19 @@ void ObjectManipulation::update_ui_from_settings()
         int axis_id = 0;
         for (ManipulationEditor* editor : m_editors) {
 //            editor->SetForegroundColour(m_use_colors ? wxColour(axes_color_text[axis_id]) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-#ifdef _WIN32
-            if (m_use_colors)
+            if (m_use_colors) {
                 editor->SetBackgroundColour(wxColour(axes_color_back[axis_id]));
-            else
+                if (wxGetApp().dark_mode())
+                    editor->SetForegroundColour(*wxBLACK);
+            }
+            else {
+#ifdef _WIN32
                 wxGetApp().UpdateDarkUI(editor);
 #else
-            editor->SetBackgroundColour(m_use_colors ? wxColour(axes_color_back[axis_id]) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+                editor->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+                editor->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 #endif /* _WIN32 */
+            }
             editor->Refresh();
             if (++axis_id == 3)
                 axis_id = 0;
@@ -776,8 +780,12 @@ void ObjectManipulation::update_item_name(const wxString& item_name)
     m_item_name->SetLabel(item_name);
 }
 
-void ObjectManipulation::update_warning_icon_state(const wxString& tooltip)
-{
+void ObjectManipulation::update_warning_icon_state(const MeshErrorsInfo& warning)
+{   
+    if (const std::string& warning_icon_name = warning.warning_icon_name;
+        !warning_icon_name.empty())
+        m_manifold_warning_bmp = ScalableBitmap(m_parent, warning_icon_name);
+    const wxString& tooltip = warning.tooltip;
     m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
     m_fix_throught_netfab_bitmap->SetMinSize(tooltip.IsEmpty() ? wxSize(0,0) : m_manifold_warning_bmp.bmp().GetSize());
     m_fix_throught_netfab_bitmap->SetToolTip(tooltip);
@@ -1005,10 +1013,10 @@ void ObjectManipulation::sys_color_changed()
     get_og()->sys_color_changed();
     wxGetApp().UpdateDarkUI(m_word_local_combo);
     wxGetApp().UpdateDarkUI(m_check_inch);
-
+#endif
     for (ManipulationEditor* editor : m_editors)
         editor->sys_color_changed(this);
-#endif
+
     // btn...->msw_rescale() updates icon on button, so use it
     m_mirror_bitmap_on.msw_rescale();
     m_mirror_bitmap_off.msw_rescale();
@@ -1041,6 +1049,7 @@ ManipulationEditor::ManipulationEditor(ObjectManipulation* parent,
 #endif // __WXOSX__
     if (parent->use_colors()) {
         this->SetBackgroundColour(wxColour(axes_color_back[axis]));
+        this->SetForegroundColour(*wxBLACK);
     } else {
         wxGetApp().UpdateDarkUI(this);
     }
@@ -1093,10 +1102,14 @@ void ManipulationEditor::msw_rescale()
 
 void ManipulationEditor::sys_color_changed(ObjectManipulation* parent)
 {
-    if (!parent->use_colors())
-        wxGetApp().UpdateDarkUI(this);
-    else
+    if (parent->use_colors())
         SetForegroundColour(*wxBLACK);
+    else
+#ifdef _WIN32
+        wxGetApp().UpdateDarkUI(this);
+#else
+        SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+#endif // _WIN32
 }
 
 double ManipulationEditor::get_value()
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index 92ba01775..a15c72fb8 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "GUI_ObjectSettings.hpp"
+#include "GUI_ObjectList.hpp"
 #include "libslic3r/Point.hpp"
 #include <float.h>
 
@@ -194,7 +195,7 @@ public:
 #endif // __APPLE__
 
     void update_item_name(const wxString &item_name);
-    void update_warning_icon_state(const wxString& tooltip);
+    void update_warning_icon_state(const MeshErrorsInfo& warning);
     void msw_rescale();
     void sys_color_changed();
     void on_change(const std::string& opt_key, int axis, double new_value);
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index f8a10bb8e..57840dda2 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -496,13 +496,22 @@ void Preview::on_combochecklist_features(wxCommandEvent& evt)
 
 void Preview::on_combochecklist_options(wxCommandEvent& evt)
 {
-    unsigned int curr_flags = m_canvas->get_gcode_options_visibility_flags();
-    unsigned int new_flags = Slic3r::GUI::combochecklist_get_flags(m_combochecklist_options);
+    const unsigned int curr_flags = m_canvas->get_gcode_options_visibility_flags();
+    const unsigned int new_flags = Slic3r::GUI::combochecklist_get_flags(m_combochecklist_options);
     if (curr_flags == new_flags)
         return;
 
     m_canvas->set_gcode_options_visibility_from_flags(new_flags);
-    m_canvas->refresh_gcode_preview_render_paths();
+    if (m_canvas->get_gcode_view_type() == GCodeViewer::EViewType::Feedrate) {
+        const unsigned int diff_flags = curr_flags ^ new_flags;
+        if ((diff_flags & (1 << static_cast<unsigned int>(Preview::OptionType::Travel))) != 0)
+            refresh_print();
+        else
+            m_canvas->refresh_gcode_preview_render_paths();
+    }
+    else
+        m_canvas->refresh_gcode_preview_render_paths();
+
     update_moves_slider();
 }
 
@@ -632,7 +641,6 @@ void Preview::update_layers_slider(const std::vector<double>& layers_z, bool kee
     update_layers_slider_mode();
 
     Plater* plater = wxGetApp().plater();
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     CustomGCode::Info ticks_info_from_model;
     if (wxGetApp().is_editor())
         ticks_info_from_model = plater->model().custom_gcode_per_print_z;
@@ -640,18 +648,10 @@ void Preview::update_layers_slider(const std::vector<double>& layers_z, bool kee
         ticks_info_from_model.mode = CustomGCode::Mode::SingleExtruder;
         ticks_info_from_model.gcodes = m_canvas->get_custom_gcode_per_print_z();
     }
-#else
-    CustomGCode::Info& ticks_info_from_model = plater->model().custom_gcode_per_print_z;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     check_layers_slider_values(ticks_info_from_model.gcodes, layers_z);
 
     //first of all update extruder colors to avoid crash, when we are switching printer preset from MM to SM
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     m_layers_slider->SetExtruderColors(plater->get_extruder_colors_from_plater_config(wxGetApp().is_editor() ? nullptr : m_gcode_result));
-#else
-    m_layers_slider->SetExtruderColors(plater->get_extruder_colors_from_plater_config());
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
-
     m_layers_slider->SetSliderValues(layers_z);
     assert(m_layers_slider->GetMinValue() == 0);
     m_layers_slider->SetMaxValue(layers_z.empty() ? 0 : layers_z.size() - 1);
@@ -734,9 +734,9 @@ void Preview::update_layers_slider(const std::vector<double>& layers_z, bool kee
 
             double top_area = area(object->get_layer(int(object->layers().size()) - 1)->lslices);
             if( bottom_area - top_area > delta_area) {
-                std::shared_ptr<NotificationManager> notif_mngr = wxGetApp().plater()->get_notification_manager();
+                NotificationManager *notif_mngr = wxGetApp().plater()->get_notification_manager();
                 notif_mngr->push_notification(
-                    NotificationType::SignDetected, NotificationManager::NotificationLevel::RegularNotificationLevel,
+                    NotificationType::SignDetected, NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                     _u8L("NOTE:") + "\n" + _u8L("Sliced object looks like the sign") + "\n",
                     _u8L("Apply auto color change to print"),
                     [this](wxEvtHandler*) {
@@ -921,14 +921,10 @@ void Preview::load_print_as_fff(bool keep_z_range)
         colors = wxGetApp().plater()->get_colors_for_color_print(m_gcode_result);
 
         if (!gcode_preview_data_valid) {
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             if (wxGetApp().is_editor())
                 color_print_values = wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes;
             else
                 color_print_values = m_canvas->get_custom_gcode_per_print_z();
-#else
-            color_print_values = wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes;
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             colors.push_back("#808080"); // gray color for pause print or custom G-code 
         }
     }
@@ -950,11 +946,7 @@ void Preview::load_print_as_fff(bool keep_z_range)
             zs = m_canvas->get_gcode_layers_zs();
             m_loaded = true;
         }
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         else if (wxGetApp().is_editor()) {
-#else
-        else {
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
             // Load the initial preview based on slices, not the final G-code.
             m_canvas->load_preview(colors, color_print_values);
             m_left_sizer->Hide(m_bottom_toolbar_panel);
@@ -963,7 +955,6 @@ void Preview::load_print_as_fff(bool keep_z_range)
             zs = m_canvas->get_volumes_print_zs(true);
         }
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         if (!zs.empty() && !m_keep_current_preview_type) {
             unsigned int number_extruders = wxGetApp().is_editor() ?
                 (unsigned int)print->extruders().size() :
@@ -980,14 +971,12 @@ void Preview::load_print_as_fff(bool keep_z_range)
                 if (0 <= type && type < static_cast<int>(GCodeViewer::EViewType::Count)) {
                     m_choice_view_type->SetSelection(type);
                     m_canvas->set_gcode_view_preview_type(static_cast<GCodeViewer::EViewType>(type));
-                    if (wxGetApp().is_gcode_viewer()) {
+                    if (wxGetApp().is_gcode_viewer())
                         m_keep_current_preview_type = true;
-                        refresh_print();
-                    }
+                    refresh_print();
                 }
             }
         }
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
         if (zs.empty()) {
             // all layers filtered out
@@ -996,23 +985,6 @@ void Preview::load_print_as_fff(bool keep_z_range)
         } else
             update_layers_slider(zs, keep_z_range);
     }
-
-#if !ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
-    if (!m_keep_current_preview_type) {
-        unsigned int number_extruders = (unsigned int)print->extruders().size();
-        const wxString choice = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty() ?
-            _L("Color Print") :
-            (number_extruders > 1) ? _L("Tool") : _L("Feature type");
-
-        int type = m_choice_view_type->FindString(choice);
-        if (m_choice_view_type->GetSelection() != type) {
-            if (0 <= type && type < static_cast<int>(GCodeViewer::EViewType::Count)) {
-                m_choice_view_type->SetSelection(type);
-                m_canvas->set_gcode_view_preview_type(static_cast<GCodeViewer::EViewType>(type));
-            }
-        }
-    }
-#endif // !ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 }
 
 void Preview::load_print_as_sla()
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
index 64479a39e..393be1a4e 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
@@ -53,9 +53,9 @@ void GLGizmoBase::Grabber::render(float size, const std::array<float, 4>& render
     if (! cube_initialized) {
         // This cannot be done in constructor, OpenGL is not yet
         // initialized at that point (on Linux at least).
-        TriangleMesh mesh = make_cube(1., 1., 1.);
-        mesh.translate(Vec3f(-0.5, -0.5, -0.5));
-        const_cast<GLModel&>(cube).init_from(mesh);
+        indexed_triangle_set mesh = its_make_cube(1., 1., 1.);
+        its_translate(mesh, Vec3f(-0.5, -0.5, -0.5));
+        const_cast<GLModel&>(cube).init_from(mesh, BoundingBoxf3{ { -0.5, -0.5, -0.5 }, { 0.5, 0.5, 0.5 } });
         const_cast<bool&>(cube_initialized) = true;
     }
 
@@ -90,9 +90,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u
     m_base_color = DEFAULT_BASE_COLOR;
     m_drag_color = DEFAULT_DRAG_COLOR;
     m_highlight_color = DEFAULT_HIGHLIGHT_COLOR;
-    m_cone.init_from(make_cone(1., 1., 2 * PI / 24));
-    m_sphere.init_from(make_sphere(1., (2 * M_PI) / 24.));
-    m_cylinder.init_from(make_cylinder(1., 1., 2 * PI / 24.));
+    m_cone.init_from(its_make_cone(1., 1., 2 * PI / 24));
+    m_sphere.init_from(its_make_sphere(1., (2 * M_PI) / 24.));
+    m_cylinder.init_from(its_make_cylinder(1., 1., 2 * PI / 24.));
 }
 
 void GLGizmoBase::set_hover_id(int id)
@@ -237,9 +237,8 @@ void GLGizmoBase::render_input_window(float x, float y, float bottom_limit)
 std::string GLGizmoBase::get_name(bool include_shortcut) const
 {
     int key = get_shortcut_key();
-    assert( key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z);
     std::string out = on_get_name();
-    if (include_shortcut)
+    if (include_shortcut && key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z)
         out += std::string(" [") + char(int('A') + key - int(WXK_CONTROL_A)) + "]";
     return out;
 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
index 05f6adb5e..6c2c6afaf 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
@@ -136,6 +136,7 @@ public:
     bool is_selectable() const { return on_is_selectable(); }
     CommonGizmosDataID get_requirements() const { return on_get_requirements(); }
     virtual bool wants_enter_leave_snapshots() const { return false; }
+    virtual std::string get_action_snapshot_name() { return _u8L("Gizmo action"); }
     void set_common_data_pool(CommonGizmosDataPool* ptr) { m_c = ptr; }
 
     unsigned int get_sprite_id() const { return m_sprite_id; }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index 3dcb9e2b1..b14819671 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -16,9 +16,7 @@
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/Model.hpp"
-#if ENABLE_SINKING_CONTOURS
 #include "libslic3r/TriangleMeshSlicer.hpp"
-#endif // ENABLE_SINKING_CONTOURS
 
 namespace Slic3r {
 namespace GUI {
@@ -92,9 +90,7 @@ void GLGizmoCut::on_render()
     m_max_z = box.max.z();
     set_cut_z(m_cut_z);
 
-#if ENABLE_SINKING_CONTOURS
     update_contours();
-#endif // ENABLE_SINKING_CONTOURS
 
     const float min_x = box.min.x() - Margin;
     const float max_x = box.max.x() + Margin;
@@ -143,13 +139,11 @@ void GLGizmoCut::on_render()
 
     shader->stop_using();
 
-#if ENABLE_SINKING_CONTOURS
     glsafe(::glPushMatrix());
     glsafe(::glTranslated(m_cut_contours.shift.x(), m_cut_contours.shift.y(), m_cut_contours.shift.z()));
     glsafe(::glLineWidth(2.0f));
     m_cut_contours.contours.render();
     glsafe(::glPopMatrix());
-#endif // ENABLE_SINKING_CONTOURS
 }
 
 void GLGizmoCut::on_render_for_picking()
@@ -188,7 +182,7 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit)
     double cut_z = m_cut_z;
     if (imperial_units)
         cut_z *= ObjectManipulation::mm_to_in;
-    ImGui::InputDouble("", &cut_z, 0.0f, 0.0f, "%.2f");
+    ImGui::InputDouble("", &cut_z, 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_CharsDecimal);
 
     ImGui::SameLine();
     m_imgui->text(imperial_units ? _L("in") : _L("mm"));
@@ -275,7 +269,6 @@ BoundingBoxf3 GLGizmoCut::bounding_box() const
     return ret;
 }
 
-#if ENABLE_SINKING_CONTOURS
 void GLGizmoCut::update_contours()
 {
     const Selection& selection = m_parent.get_selection();
@@ -289,10 +282,8 @@ void GLGizmoCut::update_contours()
         if (m_cut_contours.cut_z != m_cut_z || m_cut_contours.object_id != model_object->id() || m_cut_contours.instance_idx != instance_idx) {
             m_cut_contours.cut_z = m_cut_z;
 
-            if (m_cut_contours.object_id != model_object->id()) {
+            if (m_cut_contours.object_id != model_object->id())
                 m_cut_contours.mesh = model_object->raw_mesh();
-                m_cut_contours.mesh.repair();
-            }
 
             m_cut_contours.position = box.center();
             m_cut_contours.shift = Vec3d::Zero();
@@ -315,7 +306,6 @@ void GLGizmoCut::update_contours()
     else
         m_cut_contours.contours.reset();
 }
-#endif // ENABLE_SINKING_CONTOURS
 
 } // namespace GUI
 } // namespace Slic3r
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
index b691357af..4007f89d4 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
@@ -2,11 +2,9 @@
 #define slic3r_GLGizmoCut_hpp_
 
 #include "GLGizmoBase.hpp"
-#if ENABLE_SINKING_CONTOURS
 #include "slic3r/GUI/GLModel.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/ObjectID.hpp"
-#endif // ENABLE_SINKING_CONTOURS
 
 namespace Slic3r {
 namespace GUI {
@@ -26,7 +24,6 @@ class GLGizmoCut : public GLGizmoBase
     bool m_keep_lower{ true };
     bool m_rotate_lower{ false };
 
-#if ENABLE_SINKING_CONTOURS
     struct CutContours
     {
         TriangleMesh mesh;
@@ -39,7 +36,6 @@ class GLGizmoCut : public GLGizmoBase
     };
 
     CutContours m_cut_contours;
-#endif // ENABLE_SINKING_CONTOURS
 
 public:
     GLGizmoCut(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@@ -66,9 +62,7 @@ private:
     void perform_cut(const Selection& selection);
     double calc_projection(const Linef3& mouse_ray) const;
     BoundingBoxf3 bounding_box() const;
-#if ENABLE_SINKING_CONTOURS
     void update_contours();
-#endif // ENABLE_SINKING_CONTOURS
 };
 
 } // namespace GUI
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 1ebba4d11..437106fed 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -8,6 +8,7 @@
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 
 #include <GL/glew.h>
@@ -165,7 +166,8 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
     ImGui::Separator();
 
     if (m_imgui->button(m_desc.at("remove_all"))) {
-        Plater::TakeSnapshot snapshot(wxGetApp().plater(), wxString(_L("Reset selection")));
+        Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Reset selection"),
+                                      UndoRedo::SnapshotType::GizmoAction);
         ModelObject* mo = m_c->selection_info()->model_object();
         int idx = -1;
         for (ModelVolume* mv : mo->volumes) {
@@ -287,18 +289,17 @@ void GLGizmoFdmSupports::select_facets_by_angle(float threshold_deg, bool block)
         float dot_limit = limit.dot(down);
 
         // Now calculate dot product of vert_direction and facets' normals.
-        int idx = -1;
-        for (const stl_facet &facet : mv->mesh().stl.facet_start) {
-            ++idx;
-            if (facet.normal.dot(down) > dot_limit) {
+        int idx = 0;
+        const indexed_triangle_set &its = mv->mesh().its;
+        for (stl_triangle_vertex_indices face : its.indices) {
+            if (its_face_normal(its, face).dot(down) > dot_limit) {
                 m_triangle_selectors[mesh_id]->set_facet(idx, block ? EnforcerBlockerType::BLOCKER : EnforcerBlockerType::ENFORCER);
                 m_triangle_selectors.back()->request_update_render_data();
             }
+            ++ idx;
         }
     }
 
-    activate_internal_undo_redo_stack(true);
-
     Plater::TakeSnapshot snapshot(wxGetApp().plater(), block ? _L("Block supports by angle")
                                                     : _L("Add supports by angle"));
     update_model_object();
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
index f2c19ba5c..0fb03140a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
@@ -21,6 +21,8 @@ protected:
 
     std::string get_gizmo_entering_text() const override { return _u8L("Entering Paint-on supports"); }
     std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Paint-on supports"); }
+    std::string get_action_snapshot_name() override { return _u8L("Paint-on supports editing"); }
+
 
 private:
     bool on_init() override;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
index b8c7d9f92..9e30202bd 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
@@ -142,11 +142,13 @@ void GLGizmoFlatten::update_planes()
 
     // Now we'll go through all the facets and append Points of facets sharing the same normal.
     // This part is still performed in mesh coordinate system.
-    const int num_of_facets = ch.stl.stats.number_of_facets;
-    std::vector<int>  facet_queue(num_of_facets, 0);
-    std::vector<bool> facet_visited(num_of_facets, false);
-    int               facet_queue_cnt = 0;
-    const stl_normal* normal_ptr = nullptr;
+    const int                num_of_facets  = ch.facets_count();
+    const std::vector<Vec3f> face_normals   = its_face_normals(ch.its);
+    const std::vector<Vec3i> face_neighbors = its_face_neighbors(ch.its);
+    std::vector<int>         facet_queue(num_of_facets, 0);
+    std::vector<bool>        facet_visited(num_of_facets, false);
+    int                      facet_queue_cnt = 0;
+    const stl_normal*        normal_ptr      = nullptr;
     while (1) {
         // Find next unvisited triangle:
         int facet_idx = 0;
@@ -154,7 +156,7 @@ void GLGizmoFlatten::update_planes()
             if (!facet_visited[facet_idx]) {
                 facet_queue[facet_queue_cnt ++] = facet_idx;
                 facet_visited[facet_idx] = true;
-                normal_ptr = &ch.stl.facet_start[facet_idx].normal;
+                normal_ptr = &face_normals[facet_idx];
                 m_planes.emplace_back();
                 break;
             }
@@ -163,18 +165,16 @@ void GLGizmoFlatten::update_planes()
 
         while (facet_queue_cnt > 0) {
             int facet_idx = facet_queue[-- facet_queue_cnt];
-            const stl_normal& this_normal = ch.stl.facet_start[facet_idx].normal;
+            const stl_normal& this_normal = face_normals[facet_idx];
             if (std::abs(this_normal(0) - (*normal_ptr)(0)) < 0.001 && std::abs(this_normal(1) - (*normal_ptr)(1)) < 0.001 && std::abs(this_normal(2) - (*normal_ptr)(2)) < 0.001) {
-                stl_vertex* first_vertex = ch.stl.facet_start[facet_idx].vertex;
+                const Vec3i face = ch.its.indices[facet_idx];
                 for (int j=0; j<3; ++j)
-                    m_planes.back().vertices.emplace_back(first_vertex[j].cast<double>());
+                    m_planes.back().vertices.emplace_back(ch.its.vertices[face[j]].cast<double>());
 
                 facet_visited[facet_idx] = true;
-                for (int j = 0; j < 3; ++ j) {
-                    int neighbor_idx = ch.stl.neighbors_start[facet_idx].neighbor[j];
-                    if (! facet_visited[neighbor_idx])
+                for (int j = 0; j < 3; ++ j)
+                    if (int neighbor_idx = face_neighbors[facet_idx][j]; neighbor_idx >= 0 && ! facet_visited[neighbor_idx])
                         facet_queue[facet_queue_cnt ++] = neighbor_idx;
-                }
             }
         }
         m_planes.back().normal = normal_ptr->cast<double>();
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
index f405f457d..17630e5c6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
@@ -20,7 +20,7 @@ namespace GUI {
 GLGizmoHollow::GLGizmoHollow(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
     : GLGizmoBase(parent, icon_filename, sprite_id)
 {
-    m_vbo_cylinder.init_from(make_cylinder(1., 1.));
+    m_vbo_cylinder.init_from(its_make_cylinder(1., 1.));
 }
 
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 4bd98f8c8..d7824357f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -11,6 +11,7 @@
 #include "slic3r/GUI/NotificationManager.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Model.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 
 #include <GL/glew.h>
@@ -22,7 +23,7 @@ static inline void show_notification_extruders_limit_exceeded()
     wxGetApp()
         .plater()
         ->get_notification_manager()
-        ->push_notification(NotificationType::MmSegmentationExceededExtrudersLimit, NotificationManager::NotificationLevel::RegularNotificationLevel,
+        ->push_notification(NotificationType::MmSegmentationExceededExtrudersLimit, NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                             GUI::format(_L("Your printer has more extruders than the multi-material painting gizmo supports. For this reason, only the "
                                            "first %1% extruders will be able to be used for painting."), GLGizmoMmuSegmentation::EXTRUDERS_LIMIT));
 }
@@ -291,6 +292,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
     m_imgui->text("");
     ImGui::Separator();
 
+    ImGui::AlignTextToFramePadding();
     m_imgui->text(m_desc.at("first_color"));
     ImGui::SameLine(combo_label_width);
     ImGui::PushItemWidth(window_width - combo_label_width - color_button_width);
@@ -302,6 +304,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
     if(ImGui::ColorEdit4("First color##color_picker", (float*)&first_color, ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel))
         m_modified_extruders_colors[m_first_selected_extruder_idx] = {first_color.x, first_color.y, first_color.z, first_color.w};
 
+    ImGui::AlignTextToFramePadding();
     m_imgui->text(m_desc.at("second_color"));
     ImGui::SameLine(combo_label_width);
     ImGui::PushItemWidth(window_width - combo_label_width - color_button_width);
@@ -317,14 +320,12 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
 
     ImGui::Separator();
 
-    ImGui::AlignTextToFramePadding();
     m_imgui->text(m_desc.at("tool_type"));
 
     float tool_type_offset = (window_width - tool_type_radio_brush - tool_type_radio_bucket_fill - tool_type_radio_smart_fill + m_imgui->scaled(2.f)) / 2.f;
 
     ImGui::NewLine();
 
-    ImGui::AlignTextToFramePadding();
     ImGui::SameLine(tool_type_offset + m_imgui->scaled(0.f));
     ImGui::PushItemWidth(tool_type_radio_brush);
     if (m_imgui->radio_button(m_desc["tool_brush"], m_tool_type == GLGizmoMmuSegmentation::ToolType::BRUSH)) {
@@ -382,12 +383,10 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
     ImGui::Separator();
 
     if(m_tool_type == ToolType::BRUSH) {
-        ImGui::AlignTextToFramePadding();
         m_imgui->text(m_desc.at("cursor_type"));
         ImGui::NewLine();
 
         float cursor_type_offset = (window_width - cursor_type_radio_sphere - cursor_type_radio_circle - cursor_type_radio_pointer + m_imgui->scaled(2.f)) / 2.f;
-        ImGui::AlignTextToFramePadding();
         ImGui::SameLine(cursor_type_offset + m_imgui->scaled(0.f));
         ImGui::PushItemWidth(cursor_type_radio_sphere);
         if (m_imgui->radio_button(m_desc["sphere"], m_cursor_type == TriangleSelector::CursorType::SPHERE))
@@ -458,8 +457,8 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
 
         ImGui::Separator();
     } else if(m_tool_type == ToolType::SMART_FILL) {
-        m_imgui->text(m_desc["smart_fill_angle"] + ":");
         ImGui::AlignTextToFramePadding();
+        m_imgui->text(m_desc["smart_fill_angle"] + ":");
         std::string format_str = std::string("%.f") + I18N::translate_utf8("°", "Degree sign to use in the respective slider in MMU gizmo,"
                                                                                 "placed after the number with no whitespace in between.");
         ImGui::SameLine(sliders_width);
@@ -505,7 +504,8 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
 
     ImGui::Separator();
     if (m_imgui->button(m_desc.at("remove_all"))) {
-        Plater::TakeSnapshot snapshot(wxGetApp().plater(), wxString(_L("Reset selection")));
+        Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Reset selection"),
+                                      UndoRedo::SnapshotType::GizmoAction);
         ModelObject *        mo  = m_c->selection_info()->model_object();
         int                  idx = -1;
         for (ModelVolume *mv : mo->volumes)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
index ab58ba186..851a5ac4f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
@@ -130,6 +130,7 @@ protected:
 
     std::string get_gizmo_entering_text() const override { return _u8L("Entering Multimaterial painting"); }
     std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Multimaterial painting"); }
+    std::string get_action_snapshot_name() override { return _u8L("Multimaterial painting editing"); }
 
     size_t                            m_first_selected_extruder_idx  = 0;
     size_t                            m_second_selected_extruder_idx = 1;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
index e7b6a0ad6..e73a85647 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
@@ -20,7 +20,7 @@ GLGizmoMove3D::GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filenam
     , m_starting_box_center(Vec3d::Zero())
     , m_starting_box_bottom_center(Vec3d::Zero())
 {
-    m_vbo_cone.init_from(make_cone(1., 1., 2*PI/36));
+    m_vbo_cone.init_from(its_make_cone(1., 1., 2*PI/36));
 }
 
 std::string GLGizmoMove3D::get_tooltip() const
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
index 155738b32..42bdd0843 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
@@ -8,8 +8,10 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Camera.hpp"
 #include "slic3r/GUI/Plater.hpp"
-#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 
 
@@ -20,46 +22,10 @@ GLGizmoPainterBase::GLGizmoPainterBase(GLCanvas3D& parent, const std::string& ic
     : GLGizmoBase(parent, icon_filename, sprite_id)
 {
     // Make sphere and save it into a vertex buffer.
-    const TriangleMesh sphere_mesh = make_sphere(1., (2*M_PI)/24.);
-    for (size_t i=0; i<sphere_mesh.its.vertices.size(); ++i)
-        m_vbo_sphere.push_geometry(sphere_mesh.its.vertices[i].cast<double>(),
-                                    sphere_mesh.stl.facet_start[i].normal.cast<double>());
-    for (const stl_triangle_vertex_indices& indices : sphere_mesh.its.indices)
-        m_vbo_sphere.push_triangle(indices(0), indices(1), indices(2));
+    m_vbo_sphere.load_its_flat_shading(its_make_sphere(1., (2*M_PI)/24.));
     m_vbo_sphere.finalize_geometry(true);
 }
 
-
-
-// port of 948bc382655993721d93d3b9fce9b0186fcfb211
-void GLGizmoPainterBase::activate_internal_undo_redo_stack(bool activate)
-{
-    Plater* plater = wxGetApp().plater();
-
-    // Following is needed to prevent taking an extra snapshot when the activation of
-    // the internal stack happens when the gizmo is already active (such as open gizmo,
-    // close gizmo, undo, start painting). The internal stack does not activate on the
-    // undo, because that would obliterate all future of the main stack (user would
-    // have to close the gizmo himself, he has no access to main undo/redo after the
-    // internal stack opens). We don't want the "entering" snapshot taken in this case,
-    // because there already is one.
-    std::string last_snapshot_name;
-    plater->undo_redo_topmost_string_getter(plater->can_undo(), last_snapshot_name);
-
-    if (activate && !m_internal_stack_active) {
-        if (std::string str = this->get_gizmo_entering_text(); last_snapshot_name != str)
-            Plater::TakeSnapshot(plater, str);
-        plater->enter_gizmos_stack();
-        m_internal_stack_active = true;
-    }
-    if (!activate && m_internal_stack_active) {
-        plater->leave_gizmos_stack();
-        if (std::string str = this->get_gizmo_leaving_text(); last_snapshot_name != str)
-            Plater::TakeSnapshot(plater, str);
-        m_internal_stack_active = false;
-    }
-}
-
 void GLGizmoPainterBase::set_painter_gizmo_data(const Selection& selection)
 {
     if (m_state != On)
@@ -455,8 +421,7 @@ bool GLGizmoPainterBase::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
       && m_button_down != Button::None) {
         // Take snapshot and update ModelVolume data.
         wxString action_name = this->handle_snapshot_action_name(shift_down, m_button_down);
-        activate_internal_undo_redo_stack(true);
-        Plater::TakeSnapshot snapshot(wxGetApp().plater(), action_name);
+        Plater::TakeSnapshot snapshot(wxGetApp().plater(), action_name, UndoRedo::SnapshotType::GizmoAction);
         update_model_object();
 
         m_button_down = Button::None;
@@ -553,16 +518,10 @@ void GLGizmoPainterBase::on_set_state()
 
     if (m_state == On && m_old_state != On) { // the gizmo was just turned on
         on_opening();
-        if (! m_parent.get_gizmos_manager().is_serializing()) {
-            wxGetApp().CallAfter([this]() {
-                activate_internal_undo_redo_stack(true);
-            });
-        }
     }
     if (m_state == Off && m_old_state != Off) { // the gizmo was just turned Off
         // we are actually shutting down
         on_shutdown();
-        activate_internal_undo_redo_stack(false);
         m_old_mo_id = -1;
         //m_iva.release_geometry();
         m_triangle_selectors.clear();
@@ -632,9 +591,15 @@ void TriangleSelectorGUI::update_render_data()
 
         GLIndexedVertexArray &iva = tr.get_state() == EnforcerBlockerType::ENFORCER ? m_iva_enforcers : m_iva_blockers;
         int &                 cnt = tr.get_state() == EnforcerBlockerType::ENFORCER ? enf_cnt : blc_cnt;
-
-        for (int i = 0; i < 3; ++i)
-            iva.push_geometry(m_vertices[tr.verts_idxs[i]].v, m_mesh->stl.facet_start[tr.source_triangle].normal);
+        const Vec3f          &v0  = m_vertices[tr.verts_idxs[0]].v;
+        const Vec3f          &v1  = m_vertices[tr.verts_idxs[1]].v;
+        const Vec3f          &v2  = m_vertices[tr.verts_idxs[2]].v;
+        //FIXME the normal may likely be pulled from m_triangle_selectors, but it may not be worth the effort 
+        // or the current implementation may be more cache friendly.
+        const Vec3f           n   = (v1 - v0).cross(v2 - v1).normalized();
+        iva.push_geometry(v0, n);
+        iva.push_geometry(v1, n);
+        iva.push_geometry(v2, n);
         iva.push_triangle(cnt, cnt + 1, cnt + 2);
         cnt += 3;
     }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
index 6a15ab2a5..8d37f2404 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
@@ -57,30 +57,32 @@ private:
     std::array<GLIndexedVertexArray, 3> m_varrays;
 };
 
+class GLGizmoTransparentRender 
+{
+public:
+    // Following function renders the triangles and cursor. Having this separated
+    // from usual on_render method allows to render them before transparent
+    // objects, so they can be seen inside them. The usual on_render is called
+    // after all volumes (including transparent ones) are rendered.
+    virtual void render_painter_gizmo() const = 0;
+};
 
 // Following class is a base class for a gizmo with ability to paint on mesh
 // using circular blush (such as FDM supports gizmo and seam painting gizmo).
 // The purpose is not to duplicate code related to mesh painting.
-class GLGizmoPainterBase : public GLGizmoBase
+class GLGizmoPainterBase : public GLGizmoTransparentRender, public GLGizmoBase
 {
 private:
     ObjectID m_old_mo_id;
     size_t m_old_volumes_size = 0;
     void on_render() override {}
     void on_render_for_picking() override {}
-
 public:
     GLGizmoPainterBase(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
     ~GLGizmoPainterBase() override = default;
     virtual void set_painter_gizmo_data(const Selection& selection);
     virtual bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down);
 
-    // Following function renders the triangles and cursor. Having this separated
-    // from usual on_render method allows to render them before transparent objects,
-    // so they can be seen inside them. The usual on_render is called after all
-    // volumes (including transparent ones) are rendered.
-    virtual void render_painter_gizmo() const = 0;
-
 protected:
     void render_triangles(const Selection& selection, const bool use_polygon_offset_fill = true) const;
     void render_cursor() const;
@@ -88,7 +90,6 @@ protected:
     void render_cursor_sphere(const Transform3d& trafo) const;
     virtual void update_model_object() const = 0;
     virtual void update_from_model_object() = 0;
-    void activate_internal_undo_redo_stack(bool activate);
 
     virtual std::array<float, 4> get_cursor_sphere_left_button_color() const { return {0.f, 0.f, 1.f, 0.25f}; }
     virtual std::array<float, 4> get_cursor_sphere_right_button_color() const { return {1.f, 0.f, 0.f, 0.25f}; }
@@ -170,6 +171,7 @@ protected:
     void on_load(cereal::BinaryInputArchive& ar) override;
     void on_save(cereal::BinaryOutputArchive& ar) const override {}
     CommonGizmosDataID on_get_requirements() const override;
+    bool wants_enter_leave_snapshots() const override { return true; }
 
     virtual wxString handle_snapshot_action_name(bool shift_down, Button button_down) const = 0;
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index a2ee56d9a..b23528772 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -8,6 +8,7 @@
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 #include <GL/glew.h>
 
@@ -121,7 +122,8 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
     m_imgui->text("");
 
     if (m_imgui->button(m_desc.at("remove_all"))) {
-        Plater::TakeSnapshot snapshot(wxGetApp().plater(), wxString(_L("Reset selection")));
+        Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Reset selection"),
+                                      UndoRedo::SnapshotType::GizmoAction);
         ModelObject* mo = m_c->selection_info()->model_object();
         int idx = -1;
         for (ModelVolume* mv : mo->volumes) {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
index 7a00a9d8e..408c2ec4c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
@@ -22,6 +22,7 @@ protected:
 
     std::string get_gizmo_entering_text() const override { return _u8L("Entering Seam painting"); }
     std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Seam painting"); }
+    std::string get_action_snapshot_name() override { return _u8L("Paint-on seam editing"); }
 
 private:
     bool on_init() override;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
index 03c2561a6..7ffd80aab 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
@@ -1,4 +1,5 @@
 #include "GLGizmoSimplify.hpp"
+#include "slic3r/GUI/3DScene.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
@@ -19,18 +20,23 @@ GLGizmoSimplify::GLGizmoSimplify(GLCanvas3D &parent)
     , m_progress(0)
     , m_volume(nullptr)
     , m_obj_index(0)
-    , m_need_reload(false)
+    , m_need_reload(false) 
+    , m_show_wireframe(false)
 
     , tr_mesh_name(_u8L("Mesh name"))
     , tr_triangles(_u8L("Triangles"))
     , tr_preview(_u8L("Preview"))
     , tr_detail_level(_u8L("Detail level"))
     , tr_decimate_ratio(_u8L("Decimate ratio"))
+
+    , m_wireframe_VBO_id(0)
+    , m_wireframe_IBO_id(0)
 {}
 
 GLGizmoSimplify::~GLGizmoSimplify() { 
     m_state = State::canceling;
     if (m_worker.joinable()) m_worker.join();
+    free_gpu();
 }
 
 bool GLGizmoSimplify::on_init()
@@ -45,17 +51,24 @@ std::string GLGizmoSimplify::on_get_name() const
     return _u8L("Simplify");
 }
 
-void GLGizmoSimplify::on_render() {}
+void GLGizmoSimplify::on_render() { }
+
 void GLGizmoSimplify::on_render_for_picking() {}
 
 void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit)
 {
     create_gui_cfg();
     const Selection &selection = m_parent.get_selection();
-    int object_idx = selection.get_object_idx();
-    if (!is_selected_object(&object_idx)) return;
-    ModelObject *obj = wxGetApp().plater()->model().objects[object_idx];
-    ModelVolume *act_volume = obj->volumes.front();
+    int obj_index = selection.get_object_idx();
+    ModelVolume *act_volume = get_volume(selection, wxGetApp().plater()->model());
+    if (act_volume == nullptr) {
+        switch (m_state) {
+        case State::settings: close(); break;
+        case State::canceling: break;
+        default: m_state = State::canceling;
+        }
+        return;
+    }
 
     // Check selection of new volume
     // Do not reselect object when processing 
@@ -66,13 +79,18 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
             set_its(*m_original_its);
         }
 
-        m_obj_index = object_idx; // to remember correct object
+        // close suggestion notification
+        auto notification_manager = wxGetApp().plater()->get_notification_manager();
+        notification_manager->remove_simplify_suggestion_with_id(act_volume->get_object()->id());
+
+        m_obj_index = obj_index; // to remember correct object
         m_volume = act_volume;
         m_original_its = {};
         m_configuration.decimate_ratio = 50.; // default value
         m_configuration.fix_count_by_ratio(m_volume->mesh().its.indices.size());
         m_is_valid_result = false;
         m_exist_preview   = false;
+        init_wireframe();
 
         if (change_window_position) {
             ImVec2 pos = ImGui::GetMousePos();
@@ -95,7 +113,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
 
     int flag = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
                ImGuiWindowFlags_NoCollapse;
-    m_imgui->begin(get_name(), flag);
+    m_imgui->begin(on_get_name(), flag);
 
     size_t triangle_count = m_volume->mesh().its.indices.size();
     // already reduced mesh
@@ -186,6 +204,11 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
     ImGui::Text(_L("%d triangles").c_str(), m_configuration.wanted_count);
     m_imgui->disabled_end(); // use_count
 
+    if (ImGui::Checkbox(_L("Show wireframe").c_str(), &m_show_wireframe)) {
+        if (m_show_wireframe) init_wireframe();
+        else free_gpu();
+    }
+
     if (m_state == State::settings) {
         if (m_imgui->button(_L("Cancel"))) {
             if (m_original_its.has_value()) { 
@@ -234,7 +257,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
         // set m_state must be before close() !!!
         m_state = State::settings;
         if (close_on_end) after_apply();
-        
+        else init_wireframe();
         // Fix warning icon in object list
         wxGetApp().obj_list()->update_item_error_icon(m_obj_index, -1);
     }
@@ -311,9 +334,8 @@ void GLGizmoSimplify::process()
 }
 
 void GLGizmoSimplify::set_its(indexed_triangle_set &its) {
-    auto tm = std::make_unique<TriangleMesh>(its);
-    tm->repair();
-    m_volume->set_mesh(std::move(tm));
+    m_volume->set_mesh(its);
+    m_volume->calculate_convex_hull();
     m_volume->set_new_unique_id();
     m_volume->get_object()->invalidate_bounding_box();
     m_need_reload = true;
@@ -328,23 +350,35 @@ void GLGizmoSimplify::on_set_state()
 {
     // Closing gizmo. e.g. selecting another one
     if (GLGizmoBase::m_state == GLGizmoBase::Off) {
+        // can appear when delete objects
+        bool empty_selection = m_parent.get_selection().is_empty();
+
+        // cancel processing
+        if (empty_selection && 
+            m_state != State::settings &&
+            m_state != State::canceling)  
+            m_state = State::canceling;
+
         // refuse outgoing during simlification
         // object is not selected when it is deleted(cancel and close gizmo)
-        if (m_state != State::settings && is_selected_object()) {
+        if (m_state != State::settings && !empty_selection) {
             GLGizmoBase::m_state = GLGizmoBase::On;
             auto notification_manager = wxGetApp().plater()->get_notification_manager();
             notification_manager->push_notification(
                 NotificationType::CustomNotification,
-                NotificationManager::NotificationLevel::RegularNotificationLevel,
+                NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                 _u8L("ERROR: Wait until Simplification ends or Cancel process."));
             return;
         }
 
         // revert preview
         if (m_exist_preview) {
-            set_its(*m_original_its);
-            m_parent.reload_scene(true);
-            m_need_reload = false;
+            m_exist_preview = false;
+            if (exist_volume(m_volume)) {
+                set_its(*m_original_its);
+                m_parent.reload_scene(false);
+                m_need_reload = false;
+            }
         }
 
         // invalidate selected model
@@ -382,20 +416,131 @@ void GLGizmoSimplify::request_rerender() {
     });
 }
 
-bool GLGizmoSimplify::is_selected_object(int *object_idx)
-{
-    int index = (object_idx != nullptr) ? *object_idx :
-        m_parent.get_selection().get_object_idx();
-    // no selected object --> can appear after delete model
-    if (index < 0) {
-        switch (m_state) {
-        case State::settings: close(); break;
-        case State::canceling: break;
-        default: m_state = State::canceling;
-        }
-        return false;
+bool GLGizmoSimplify::exist_volume(ModelVolume *volume) {
+    auto objs = wxGetApp().plater()->model().objects;
+    for (const auto &obj : objs) {
+        const auto &vlms = obj->volumes;
+        auto        item = std::find(vlms.begin(), vlms.end(), volume);
+        if (item != vlms.end()) return true;
+    }
+    return false;
+}
+
+ModelVolume * GLGizmoSimplify::get_volume(const Selection &selection, Model &model)
+{
+    const Selection::IndicesList& idxs = selection.get_volume_idxs();
+    if (idxs.empty()) return nullptr;
+    // only one selected volume
+    if (idxs.size() != 1) return nullptr;
+    const GLVolume *selected_volume = selection.get_volume(*idxs.begin());
+    if (selected_volume == nullptr) return nullptr;
+
+    const GLVolume::CompositeID &cid  = selected_volume->composite_id;
+    const ModelObjectPtrs& objs = model.objects;
+    if (cid.object_id < 0 || objs.size() <= static_cast<size_t>(cid.object_id))
+        return nullptr;
+    const ModelObject* obj = objs[cid.object_id];
+    if (cid.volume_id < 0 || obj->volumes.size() <= static_cast<size_t>(cid.volume_id))
+        return nullptr;    
+    return obj->volumes[cid.volume_id];
+}
+
+const ModelVolume *GLGizmoSimplify::get_volume(const GLVolume::CompositeID &cid, const Model &model)
+{
+    const ModelObjectPtrs &objs = model.objects;
+    if (cid.object_id < 0 || objs.size() <= static_cast<size_t>(cid.object_id))
+        return nullptr;
+    const ModelObject *obj = objs[cid.object_id];
+    if (cid.volume_id < 0 || obj->volumes.size() <= static_cast<size_t>(cid.volume_id))
+        return nullptr;
+    return obj->volumes[cid.volume_id];
+}
+
+void GLGizmoSimplify::init_wireframe()
+{
+    if (!m_show_wireframe) return;
+    const indexed_triangle_set &its = m_volume->mesh().its;
+    free_gpu();
+    if (its.indices.empty()) return;
+
+    // vertices
+    glsafe(::glGenBuffers(1, &m_wireframe_VBO_id));
+    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_wireframe_VBO_id));
+    glsafe(::glBufferData(GL_ARRAY_BUFFER,
+                            its.vertices.size() * 3 * sizeof(float),
+                            its.vertices.data(), GL_STATIC_DRAW));
+    
+    // indices
+    std::vector<Vec2i> contour_indices;
+    contour_indices.reserve((its.indices.size() * 3) / 2);
+    for (const auto &triangle : its.indices) { 
+        for (size_t ti1 = 0; ti1 < 3; ++ti1) { 
+            size_t ti2 = (ti1 == 2) ? 0 : (ti1 + 1);
+            if (triangle[ti1] > triangle[ti2]) continue;
+            contour_indices.emplace_back(triangle[ti1], triangle[ti2]);
+        }
+    }
+    glsafe(::glGenBuffers(1, &m_wireframe_IBO_id));
+    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_wireframe_IBO_id));
+    glsafe(::glBufferData(GL_ARRAY_BUFFER,
+                          2*contour_indices.size() * sizeof(coord_t),
+                          contour_indices.data(), GL_STATIC_DRAW));
+    m_wireframe_IBO_size = contour_indices.size() * 2;
+    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
+}
+
+void GLGizmoSimplify::render_wireframe() const
+{
+    // is initialized?
+    if (m_wireframe_VBO_id == 0 || m_wireframe_IBO_id == 0) return;
+    if (!m_show_wireframe) return;
+
+    const auto& selection   = m_parent.get_selection();
+    const auto& volume_idxs = selection.get_volume_idxs();
+    if (volume_idxs.empty() || volume_idxs.size() != 1) return;
+    const GLVolume *selected_volume = selection.get_volume(*volume_idxs.begin());
+    
+    // check that selected model is wireframe initialized
+    if (m_volume != get_volume(selected_volume->composite_id, *m_parent.get_model()))
+        return;
+
+    const Transform3d trafo_matrix = selected_volume->world_matrix();
+    glsafe(::glPushMatrix());
+    glsafe(::glMultMatrixd(trafo_matrix.data()));
+
+    auto *contour_shader = wxGetApp().get_shader("mm_contour");
+    contour_shader->start_using();
+    glsafe(::glDepthFunc(GL_LEQUAL));
+    glsafe(::glLineWidth(1.0f));
+
+    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, m_wireframe_VBO_id));
+    glsafe(::glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), nullptr));
+    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+
+    glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_wireframe_IBO_id));
+    glsafe(::glDrawElements(GL_LINES, m_wireframe_IBO_size, GL_UNSIGNED_INT, nullptr));
+    glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
+
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+
+    glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
+    glsafe(::glDepthFunc(GL_LESS));
+
+    glsafe(::glPopMatrix()); // pop trafo
+    contour_shader->stop_using(); 
+}
+
+void GLGizmoSimplify::free_gpu()
+{
+    if (m_wireframe_VBO_id != 0) {
+        glsafe(::glDeleteBuffers(1, &m_wireframe_VBO_id));
+        m_wireframe_VBO_id = 0;
+    }
+
+    if (m_wireframe_IBO_id != 0) {
+        glsafe(::glDeleteBuffers(1, &m_wireframe_IBO_id));
+        m_wireframe_IBO_id = 0;
     }
-    return true;
 }
 
 // any existing icon filename to not influence GUI
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
index 30cf0de14..230c62cee 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
@@ -4,11 +4,14 @@
 // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code,
 // which overrides our localization "L" macro.
 #include "GLGizmoBase.hpp"
+#include "GLGizmoPainterBase.hpp" // for render wireframe
 #include "admesh/stl.h" // indexed_triangle_set
 #include <thread>
 #include <optional>
 #include <atomic>
 
+#include <GL/glew.h> // GLUint
+
 namespace Slic3r {
 
 class ModelVolume;
@@ -16,7 +19,7 @@ class ModelVolume;
 namespace GUI {
 
 
-class GLGizmoSimplify : public GLGizmoBase
+class GLGizmoSimplify: public GLGizmoBase, public GLGizmoTransparentRender // GLGizmoBase
 {    
 public:
     GLGizmoSimplify(GLCanvas3D& parent);
@@ -31,6 +34,8 @@ protected:
     virtual bool on_is_selectable() const override { return false; }
     virtual void on_set_state() override;
 
+    // GLGizmoPainterBase
+    virtual void render_painter_gizmo() const override{ render_wireframe(); }
 private:
     void after_apply();
     void close();
@@ -38,16 +43,22 @@ private:
     void set_its(indexed_triangle_set &its);
     void create_gui_cfg();
     void request_rerender();
-    bool is_selected_object(int *object_idx = nullptr);
+    // move to global functions
+    static ModelVolume *get_volume(const Selection &selection, Model &model);
+    static const ModelVolume *get_volume(const GLVolume::CompositeID &cid, const Model &model);
+
+    // return false when volume was deleted
+    static bool exist_volume(ModelVolume *volume);
 
     std::atomic_bool m_is_valid_result; // differ what to do in apply
     std::atomic_bool m_exist_preview;   // set when process end
 
     volatile int m_progress; // percent of done work
-    ModelVolume *m_volume; // 
+    ModelVolume *m_volume; // keep pointer to actual working volume
     size_t m_obj_index;
 
     std::optional<indexed_triangle_set> m_original_its;
+    bool m_show_wireframe;
 
     volatile bool m_need_reload; // after simplify, glReload must be on main thread
     std::thread m_worker;
@@ -101,6 +112,13 @@ private:
     const std::string tr_detail_level;
     const std::string tr_decimate_ratio;
 
+    // rendering wireframe
+    void render_wireframe() const;
+    void init_wireframe();
+    void free_gpu();
+    GLuint m_wireframe_VBO_id, m_wireframe_IBO_id;
+    size_t m_wireframe_IBO_size;
+
     // only temporary solution
     static const std::string M_ICON_FILENAME;
 };
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index 11446d6d7..b7a6d89fa 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -4,6 +4,7 @@
 #include "slic3r/GUI/Camera.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 #include <GL/glew.h>
 
@@ -881,7 +882,7 @@ CommonGizmosDataID GLGizmoSlaSupports::on_get_requirements() const
 
 void GLGizmoSlaSupports::ask_about_changes_call_after(std::function<void()> on_yes, std::function<void()> on_no)
 {
-    wxGetApp().CallAfter([this, on_yes, on_no]() {
+    wxGetApp().CallAfter([on_yes, on_no]() {
         // Following is called through CallAfter, because otherwise there was a problem
         // on OSX with the wxMessageDialog being shown several times when clicked into.
         MessageDialog dlg(GUI::wxGetApp().mainframe, _L("Do you want to save your manually "
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
index b22e72be9..cf4b18a86 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
@@ -270,11 +270,10 @@ void HollowedMesh::on_update()
                     m_drainholes = print_object->model_object()->sla_drain_holes;
                     m_old_hollowing_timestamp = timestamp;
 
-                    const indexed_triangle_set &interior = print_object->hollowed_interior_mesh();
+                    indexed_triangle_set interior = print_object->hollowed_interior_mesh();
                     if (!interior.empty()) {
-                        m_hollowed_interior_transformed = std::make_unique<TriangleMesh>(interior);
-                        m_hollowed_interior_transformed->repaired = false;
-                        m_hollowed_interior_transformed->repair(true);
+                        its_flip_triangles(interior);
+                        m_hollowed_interior_transformed = std::make_unique<TriangleMesh>(std::move(interior));
                         m_hollowed_interior_transformed->transform(trafo_inv);
                     }
                 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index 100cfbf52..c7434ab9f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -53,8 +53,6 @@ std::vector<size_t> GLGizmosManager::get_selectable_idxs() const
     return out;
 }
 
-
-
 size_t GLGizmosManager::get_gizmo_idx_from_mouse(const Vec2d& mouse_pos) const
 {
     if (! m_enabled)
@@ -196,7 +194,7 @@ bool GLGizmosManager::check_gizmos_closed_except(EType type) const
     if (get_current_type() != type && get_current_type() != Undefined) {
         wxGetApp().plater()->get_notification_manager()->push_notification(
                     NotificationType::CustomSupportsAndSeamRemovedAfterRepair,
-                    NotificationManager::NotificationLevel::RegularNotificationLevel,
+                    NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                     _u8L("ERROR: Please close all manipulators available from "
                          "the left toolbar first"));
         return false;
@@ -487,7 +485,7 @@ void GLGizmosManager::render_painter_gizmo() const
     if (!m_enabled || m_current == Undefined)
         return;
 
-    auto* gizmo = dynamic_cast<GLGizmoPainterBase*>(get_current());
+    auto *gizmo = dynamic_cast<GLGizmoTransparentRender*>(get_current());
     assert(gizmo); // check the precondition
     gizmo->render_painter_gizmo();
 }
@@ -1225,13 +1223,15 @@ bool GLGizmosManager::activate_gizmo(EType type)
         if (! m_parent.get_gizmos_manager().is_serializing()
          && old_gizmo->wants_enter_leave_snapshots())
             Plater::TakeSnapshot snapshot(wxGetApp().plater(),
-                Slic3r::format(_utf8("Leaving %1%"), old_gizmo->get_name(false)));
+                Slic3r::format(_utf8("Leaving %1%"), old_gizmo->get_name(false)),
+                UndoRedo::SnapshotType::LeavingGizmoWithAction);
     }
 
     if (new_gizmo && ! m_parent.get_gizmos_manager().is_serializing()
      && new_gizmo->wants_enter_leave_snapshots())
         Plater::TakeSnapshot snapshot(wxGetApp().plater(),
-            Slic3r::format(_utf8("Entering %1%"), new_gizmo->get_name(false)));
+            Slic3r::format(_utf8("Entering %1%"), new_gizmo->get_name(false)),
+            UndoRedo::SnapshotType::EnteringGizmo);
 
     m_current = type;
 
diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
index 53435e318..fc410fce2 100644
--- a/src/slic3r/GUI/HintNotification.cpp
+++ b/src/slic3r/GUI/HintNotification.cpp
@@ -5,10 +5,14 @@
 #include "GUI_ObjectList.hpp"
 #include "GLCanvas3D.hpp"
 #include "MainFrame.hpp"
+#include "Tab.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
@@ -159,6 +163,33 @@ TagCheckResult tag_check_system(const std::string& tag)
 	return TagCheckNotCompatible;
 }
 
+TagCheckResult tag_check_material(const std::string& tag)
+{
+	if (const GUI::Tab* tab = wxGetApp().get_tab(Preset::Type::TYPE_FILAMENT)) {
+		// search PrintConfig filament_type to find if allowed tag
+		if (wxGetApp().app_config->get("filament_type").find(tag)) {
+			const Preset& preset = tab->m_presets->get_edited_preset();
+			const auto* opt = preset.config.opt<ConfigOptionStrings>("filament_type");
+			if (opt->values[0] == tag)
+				return TagCheckAffirmative;
+			return TagCheckNegative;
+		}
+		return TagCheckNotCompatible;
+	}
+	/* TODO: SLA materials
+	else if (const GUI::Tab* tab = wxGetApp().get_tab(Preset::Type::TYPE_SLA_MATERIAL)) {
+		//if (wxGetApp().app_config->get("material_type").find(tag)) {
+			const Preset& preset = tab->m_presets->get_edited_preset();
+			const auto* opt = preset.config.opt<ConfigOptionStrings>("material_type");
+			if (opt->values[0] == tag)
+				return TagCheckAffirmative;
+			return TagCheckNegative;
+		//}
+		return TagCheckNotCompatible;
+	}*/
+	return TagCheckNotCompatible;
+}
+
 // return true if NOT in disabled mode.
 bool tags_check(const std::string& disabled_tags, const std::string& enabled_tags)
 {
@@ -189,6 +220,11 @@ bool tags_check(const std::string& disabled_tags, const std::string& enabled_tag
 					if (result == TagCheckResult::TagCheckAffirmative)
 						continue;
 					result = tag_check_system(tag);
+					if (result == TagCheckResult::TagCheckNegative)
+						return false;
+					if (result == TagCheckResult::TagCheckAffirmative)
+						continue;
+					result = tag_check_material(tag);
 					if (result == TagCheckResult::TagCheckNegative)
 						return false;
 					if (result == TagCheckResult::TagCheckAffirmative)
@@ -225,6 +261,11 @@ bool tags_check(const std::string& disabled_tags, const std::string& enabled_tag
 					if (result == TagCheckResult::TagCheckAffirmative)
 						return false;
 					result = tag_check_system(tag);
+					if (result == TagCheckResult::TagCheckAffirmative)
+						return false;
+					if (result == TagCheckResult::TagCheckNegative)
+						continue;
+					result = tag_check_material(tag);
 					if (result == TagCheckResult::TagCheckAffirmative)
 						return false;
 					if (result == TagCheckResult::TagCheckNegative)
@@ -392,8 +433,8 @@ void HintDatabase::load_hints_from_file(const boost::filesystem::path& path)
 					};
 					m_loaded_hints.emplace_back(hint_data);
 				} else if (dict["hypertext_type"] == "menubar") {
-					wxString menu(_L("&" + dict["hypertext_menubar_menu_name"]));
-					wxString item(_L(dict["hypertext_menubar_item_name"]));
+					wxString menu(_("&" + dict["hypertext_menubar_menu_name"]));
+					wxString item(_(dict["hypertext_menubar_item_name"]));
 					HintData	hint_data{ id_string, text1, weight, was_displayed, hypertext_text, follow_text, disabled_tags, enabled_tags, true, documentation_link, [menu, item]() { wxGetApp().mainframe->open_menubar_item(menu, item); } };
 					m_loaded_hints.emplace_back(hint_data);
 				}
@@ -917,29 +958,14 @@ void NotificationManager::HintNotification::render_right_arrow_button(ImGuiWrapp
 }
 void NotificationManager::HintNotification::render_logo(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
-	ImVec2 win_size(win_size_x, win_size_y);
-	ImVec2 win_pos(win_pos_x, win_pos_y);
-	ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(.0f, .0f, .0f, .0f));
-	ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f));
-	push_style_color(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity);
-	push_style_color(ImGuiCol_TextSelectedBg, ImVec4(0, .75f, .75f, 1.f), m_state == EState::FadingOut, m_current_fade_opacity);
-	ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(.0f, .0f, .0f, .0f));
-
-	std::wstring button_text;
-	button_text = ImGui::ClippyMarker;//LeftArrowButton;
 	std::string placeholder_text;
 	placeholder_text = ImGui::EjectButton;
-
 	ImVec2 button_pic_size = ImGui::CalcTextSize(placeholder_text.c_str());
-	ImVec2 button_size(button_pic_size.x * 1.25f * 2.f, button_pic_size.y * 1.25f * 2.f);
-	ImGui::SetCursorPosY(win_size.y / 2 - button_size.y * 1.1f);
-	ImGui::SetCursorPosX(0);
-	// shouldnt it render as text?
-	if (imgui.button(button_text.c_str(), button_size.x, button_size.y))
-	{
-	}
-	
-	ImGui::PopStyleColor(5);
+	std::wstring text;
+	text = ImGui::ClippyMarker;
+	ImGui::SetCursorPosX(button_pic_size.x / 3);
+	ImGui::SetCursorPosY(win_size_y / 2 - button_pic_size.y * 2.f);
+	imgui.text(text.c_str());
 }
 void NotificationManager::HintNotification::render_documentation_button(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
@@ -1012,7 +1038,7 @@ void NotificationManager::HintNotification::retrieve_data(bool new_hint/* = true
 	if(hint_data != nullptr)
     {
         NotificationData nd { NotificationType::DidYouKnowHint,
-						      NotificationLevel::RegularNotificationLevel,
+						      NotificationLevel::HintNotificationLevel,
 							  0,
 						      hint_data->text,
 							  hint_data->hypertext, nullptr,
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index fa9845c5d..03e5bdc09 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -48,6 +48,7 @@ static const std::map<const wchar_t, std::string> font_icons = {
     {ImGui::RightArrowHoverButton , "notification_right_hover"      },
     {ImGui::PreferencesButton      , "notification_preferences"      },
     {ImGui::PreferencesHoverButton , "notification_preferences_hover"},
+   
 };
 static const std::map<const wchar_t, std::string> font_icons_large = {
     {ImGui::CloseNotifButton        , "notification_close"              },
@@ -65,6 +66,8 @@ static const std::map<const wchar_t, std::string> font_icons_large = {
     {ImGui::VarLayerHeightMarker    , "layers"                          },
     {ImGui::DocumentationButton     , "notification_documentation"      },
     {ImGui::DocumentationHoverButton, "notification_documentation_hover"},
+    {ImGui::InfoMarker              , "notification_info"               },
+    
 };
 
 static const std::map<const wchar_t, std::string> font_icons_extra_large = {
@@ -356,7 +359,7 @@ bool ImGuiWrapper::image_button()
 
 bool ImGuiWrapper::input_double(const std::string &label, const double &value, const std::string &format)
 {
-    return ImGui::InputDouble(label.c_str(), const_cast<double*>(&value), 0.0f, 0.0f, format.c_str());
+    return ImGui::InputDouble(label.c_str(), const_cast<double*>(&value), 0.0f, 0.0f, format.c_str(), ImGuiInputTextFlags_CharsDecimal);
 }
 
 bool ImGuiWrapper::input_double(const wxString &label, const double &value, const std::string &format)
diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp
index 9535e0126..38ea95f2c 100644
--- a/src/slic3r/GUI/InstanceCheck.cpp
+++ b/src/slic3r/GUI/InstanceCheck.cpp
@@ -352,10 +352,16 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance)
 	if (instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/") && *cla.should_send) {
 #endif
 		instance_check_internal::send_message(cla.cl_string, lock_name);
-		BOOST_LOG_TRIVIAL(info) << "instance check: Another instance found. This instance will terminate.";
+		BOOST_LOG_TRIVIAL(error) << "Instance check: Another instance found. This instance will terminate. Lock file of current running instance is located at " << data_dir() << 
+#ifdef _WIN32
+			"\\cache\\"
+#else // mac & linx
+			"/cache/"
+#endif
+			<< lock_name << ".lock";
 		return true;
 	}
-	BOOST_LOG_TRIVIAL(info) << "instance check: Another instance not found or single-instance not set.";
+	BOOST_LOG_TRIVIAL(info) << "Instance check: Another instance not found or single-instance not set.";
 	
 	return false;
 }
diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
index 2ccb7a04f..a5ecc0c83 100644
--- a/src/slic3r/GUI/Jobs/ArrangeJob.hpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
@@ -9,7 +9,6 @@ namespace Slic3r {
 class ModelInstance;
 
 namespace GUI {
-class NotificationManager;
 
 class ArrangeJob : public PlaterJob
 {
@@ -18,21 +17,21 @@ class ArrangeJob : public PlaterJob
 
     ArrangePolygons m_selected, m_unselected, m_unprintable;
     std::vector<ModelInstance*> m_unarranged;
-    
+
     // clear m_selected and m_unselected, reserve space for next usage
     void clear_input();
 
     // Prepare all objects on the bed regardless of the selection
     void prepare_all();
-    
+
     // Prepare the selected and unselected items separately. If nothing is
     // selected, behaves as if everything would be selected.
     void prepare_selected();
 
     ArrangePolygon get_arrange_poly_(ModelInstance *mi);
-    
+
 protected:
-    
+
     void prepare() override;
 
     void on_exception(const std::exception_ptr &) override;
@@ -40,15 +39,15 @@ protected:
     void process() override;
 
 public:
-    ArrangeJob(std::shared_ptr<NotificationManager> nm, Plater *plater)
-        : PlaterJob{nm, plater}
+    ArrangeJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater)
+        : PlaterJob{std::move(pri), plater}
     {}
-    
+
     int status_range() const override
     {
         return int(m_selected.size() + m_unprintable.size());
     }
-    
+
     void finalize() override;
 };
 
diff --git a/src/slic3r/GUI/Jobs/FillBedJob.hpp b/src/slic3r/GUI/Jobs/FillBedJob.hpp
index 548974fa6..bf407656d 100644
--- a/src/slic3r/GUI/Jobs/FillBedJob.hpp
+++ b/src/slic3r/GUI/Jobs/FillBedJob.hpp
@@ -6,7 +6,6 @@
 namespace Slic3r { namespace GUI {
 
 class Plater;
-class NotificationManager;
 
 class FillBedJob : public PlaterJob
 {
@@ -28,8 +27,8 @@ protected:
     void process() override;
 
 public:
-    FillBedJob(std::shared_ptr<NotificationManager> nm, Plater *plater)
-        : PlaterJob{nm, plater}
+    FillBedJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater)
+        : PlaterJob{std::move(pri), plater}
     {}
 
     int status_range() const override
diff --git a/src/slic3r/GUI/Jobs/Job.cpp b/src/slic3r/GUI/Jobs/Job.cpp
index c198de40c..7590f2d42 100644
--- a/src/slic3r/GUI/Jobs/Job.cpp
+++ b/src/slic3r/GUI/Jobs/Job.cpp
@@ -2,11 +2,9 @@
 #include <exception>
 
 #include "Job.hpp"
-#include "../NotificationManager.hpp"
 #include <libslic3r/Thread.hpp>
 #include <boost/log/trivial.hpp>
 
-
 namespace Slic3r {
 
 void GUI::Job::run(std::exception_ptr &eptr)
@@ -19,7 +17,7 @@ void GUI::Job::run(std::exception_ptr &eptr)
     }
 
     m_running.store(false);
-    
+
     // ensure to call the last status to finalize the job
     update_status(status_range(), "");
 }
@@ -32,8 +30,8 @@ void GUI::Job::update_status(int st, const wxString &msg)
     wxQueueEvent(this, evt);
 }
 
-GUI::Job::Job(std::shared_ptr<NotificationManager> nm)
-    : m_notifications(nm)
+GUI::Job::Job(std::shared_ptr<ProgressIndicator> pri)
+    : m_progress(std::move(pri))
 {
     m_thread_evt_id = wxNewId();
 
@@ -42,21 +40,21 @@ GUI::Job::Job(std::shared_ptr<NotificationManager> nm)
 
         auto msg = evt.GetString();
         if (!msg.empty() && !m_worker_error)
-            m_notifications->progress_indicator_set_status_text(msg.ToUTF8().data());
+            m_progress->set_status_text(msg.ToUTF8().data());
 
         if (m_finalized) return;
 
-        m_notifications->progress_indicator_set_progress(evt.GetInt());
+        m_progress->set_progress(evt.GetInt());
         if (evt.GetInt() == status_range() || m_worker_error) {
             // set back the original range and cancel callback
-            m_notifications->progress_indicator_set_range(m_range);
-            m_notifications->progress_indicator_set_cancel_callback();
+            m_progress->set_range(m_range);
+            m_progress->set_cancel_callback();
             wxEndBusyCursor();
-            
+
             if (m_worker_error) {
                 m_finalized = true;
-                m_notifications->progress_indicator_set_status_text("");
-                m_notifications->progress_indicator_set_progress(m_range);
+                m_progress->set_status_text("");
+                m_progress->set_progress(m_range);
                 on_exception(m_worker_error);
             }
             else {
@@ -86,22 +84,22 @@ void GUI::Job::start()
 { // Start the job. No effect if the job is already running
     if (!m_running.load()) {
         prepare();
-        
+
         // Save the current status indicatior range and push the new one
-        m_range = m_notifications->progress_indicator_get_range();
-        m_notifications->progress_indicator_set_range(status_range());
-        
+        m_range = m_progress->get_range();
+        m_progress->set_range(status_range());
+
         // init cancellation flag and set the cancel callback
         m_canceled.store(false);
-        m_notifications->progress_indicator_set_cancel_callback(
+        m_progress->set_cancel_callback(
                     [this]() { m_canceled.store(true); });
-        
+
         m_finalized  = false;
         m_finalizing = false;
-        
+
         // Changing cursor to busy
         wxBeginBusyCursor();
-        
+
         try { // Execute the job
             m_worker_error = nullptr;
             m_thread = create_thread([this] { this->run(m_worker_error); });
@@ -110,7 +108,7 @@ void GUI::Job::start()
                           _(L("ERROR: not enough resources to "
                               "execute a new job.")));
         }
-        
+
         // The state changes will be undone when the process hits the
         // last status value, in the status update handler (see ctor)
     }
@@ -119,12 +117,12 @@ void GUI::Job::start()
 bool GUI::Job::join(int timeout_ms)
 {
     if (!m_thread.joinable()) return true;
-    
+
     if (timeout_ms <= 0)
         m_thread.join();
     else if (!m_thread.try_join_for(boost::chrono::milliseconds(timeout_ms)))
         return false;
-    
+
     return true;
 }
 
@@ -137,10 +135,10 @@ void GUI::ExclusiveJobGroup::start(size_t jid) {
 void GUI::ExclusiveJobGroup::join_all(int wait_ms)
 {
     std::vector<bool> aborted(m_jobs.size(), false);
-    
+
     for (size_t jid = 0; jid < m_jobs.size(); ++jid)
         aborted[jid] = m_jobs[jid]->join(wait_ms);
-    
+
     if (!std::all_of(aborted.begin(), aborted.end(), [](bool t) { return t; }))
         BOOST_LOG_TRIVIAL(error) << "Could not abort a job!";
 }
diff --git a/src/slic3r/GUI/Jobs/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp
index ed80d8b5f..8243ce943 100644
--- a/src/slic3r/GUI/Jobs/Job.hpp
+++ b/src/slic3r/GUI/Jobs/Job.hpp
@@ -8,13 +8,14 @@
 
 #include <slic3r/GUI/I18N.hpp>
 
+#include "ProgressIndicator.hpp"
+
 #include <wx/event.h>
 
 #include <boost/thread.hpp>
 
 namespace Slic3r { namespace GUI {
 
-class NotificationManager;
 // A class to handle UI jobs like arranging and optimizing rotation.
 // These are not instant jobs, the user has to be informed about their
 // state in the status progress indicator. On the other hand they are
@@ -32,7 +33,7 @@ class Job : public wxEvtHandler
     boost::thread     m_thread;
     std::atomic<bool> m_running{false}, m_canceled{false};
     bool              m_finalized = false, m_finalizing = false;
-    std::shared_ptr<NotificationManager>               m_notifications;
+    std::shared_ptr<ProgressIndicator> m_progress;
     std::exception_ptr                 m_worker_error = nullptr;
     
     void run(std::exception_ptr &);
@@ -64,7 +65,7 @@ protected:
     }
    
 public:
-    Job(std::shared_ptr<NotificationManager> nm);
+    Job(std::shared_ptr<ProgressIndicator> pri);
     
     bool is_finalized() const { return m_finalized; }
     
diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp
new file mode 100644
index 000000000..cb7170568
--- /dev/null
+++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp
@@ -0,0 +1,33 @@
+#include "NotificationProgressIndicator.hpp"
+#include "slic3r/GUI/NotificationManager.hpp"
+
+namespace Slic3r { namespace GUI {
+
+NotificationProgressIndicator::NotificationProgressIndicator(NotificationManager *nm): m_nm{nm} {}
+
+void NotificationProgressIndicator::set_range(int range)
+{
+    m_nm->progress_indicator_set_range(range);
+}
+
+void NotificationProgressIndicator::set_cancel_callback(CancelFn fn)
+{
+    m_nm->progress_indicator_set_cancel_callback(std::move(fn));
+}
+
+void NotificationProgressIndicator::set_progress(int pr)
+{
+    m_nm->progress_indicator_set_progress(pr);
+}
+
+void NotificationProgressIndicator::set_status_text(const char *msg)
+{
+    m_nm->progress_indicator_set_status_text(msg);
+}
+
+int NotificationProgressIndicator::get_range() const
+{
+    return m_nm->progress_indicator_get_range();
+}
+
+}} // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp
new file mode 100644
index 000000000..6b03af69d
--- /dev/null
+++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp
@@ -0,0 +1,26 @@
+#ifndef NOTIFICATIONPROGRESSINDICATOR_HPP
+#define NOTIFICATIONPROGRESSINDICATOR_HPP
+
+#include "ProgressIndicator.hpp"
+
+namespace Slic3r { namespace GUI {
+
+class NotificationManager;
+
+class NotificationProgressIndicator: public ProgressIndicator {
+    NotificationManager *m_nm = nullptr;
+
+public:
+
+    explicit NotificationProgressIndicator(NotificationManager *nm);
+
+    void set_range(int range) override;
+    void set_cancel_callback(CancelFn = CancelFn()) override;
+    void set_progress(int pr) override;
+    void set_status_text(const char *) override; // utf8 char array
+    int  get_range() const override;
+};
+
+}} // namespace Slic3r::GUI
+
+#endif // NOTIFICATIONPROGRESSINDICATOR_HPP
diff --git a/src/slic3r/GUI/Jobs/PlaterJob.hpp b/src/slic3r/GUI/Jobs/PlaterJob.hpp
index 52e5741aa..fcf0a54b8 100644
--- a/src/slic3r/GUI/Jobs/PlaterJob.hpp
+++ b/src/slic3r/GUI/Jobs/PlaterJob.hpp
@@ -6,7 +6,6 @@
 namespace Slic3r { namespace GUI {
 
 class Plater;
-class NotificationManager;
 
 class PlaterJob : public Job {
 protected:
@@ -16,8 +15,8 @@ protected:
 
 public:
 
-    PlaterJob(std::shared_ptr<NotificationManager> nm, Plater *plater):
-        Job{nm}, m_plater{plater} {}
+    PlaterJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater):
+        Job{std::move(pri)}, m_plater{plater} {}
 };
 
 }} // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
index f967bb7a3..cdb367f23 100644
--- a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
+++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
@@ -10,8 +10,6 @@ namespace Slic3r {
 
 namespace GUI {
 
-class NotificationManager;
-
 class RotoptimizeJob : public PlaterJob
 {
     using FindFn = std::function<Vec2d(const ModelObject &           mo,
@@ -54,8 +52,8 @@ protected:
 
 public:
 
-    RotoptimizeJob(std::shared_ptr<NotificationManager> nm, Plater *plater)
-        : PlaterJob{nm, plater}
+    RotoptimizeJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater)
+        : PlaterJob{std::move(pri), plater}
     {}
 
     void finalize() override;
diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp
index 9b9151f77..c4465edba 100644
--- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp
+++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp
@@ -20,79 +20,79 @@
 namespace Slic3r { namespace GUI {
 
 enum class Sel { modelAndProfile, profileOnly, modelOnly};
-    
+
 class ImportDlg: public wxDialog {
     wxFilePickerCtrl *m_filepicker;
     wxComboBox *m_import_dropdown, *m_quality_dropdown;
-    
+
 public:
     ImportDlg(Plater *plater)
         : wxDialog{plater, wxID_ANY, "Import SLA archive"}
     {
         auto szvert = new wxBoxSizer{wxVERTICAL};
         auto szfilepck = new wxBoxSizer{wxHORIZONTAL};
-        
+
         m_filepicker = new wxFilePickerCtrl(this, wxID_ANY,
                                             from_u8(wxGetApp().app_config->get_last_dir()), _(L("Choose SLA archive:")),
                                             "SL1 / SL1S archive files (*.sl1, *.sl1s, *.zip)|*.sl1;*.SL1;*.sl1s;*.SL1S;*.zip;*.ZIP",
                                             wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE | wxFD_OPEN | wxFD_FILE_MUST_EXIST);
-        
+
         szfilepck->Add(new wxStaticText(this, wxID_ANY, _L("Import file") + ": "), 0, wxALIGN_CENTER);
         szfilepck->Add(m_filepicker, 1);
         szvert->Add(szfilepck, 0, wxALL | wxEXPAND, 5);
-        
+
         auto szchoices = new wxBoxSizer{wxHORIZONTAL};
-        
+
         static const std::vector<wxString> inp_choices = {
             _(L("Import model and profile")),
             _(L("Import profile only")),
             _(L("Import model only"))
         };
-        
+
         m_import_dropdown = new wxComboBox(
             this, wxID_ANY, inp_choices[0], wxDefaultPosition, wxDefaultSize,
             inp_choices.size(), inp_choices.data(), wxCB_READONLY | wxCB_DROPDOWN);
-        
+
         szchoices->Add(m_import_dropdown);
         szchoices->Add(new wxStaticText(this, wxID_ANY, _L("Quality") + ": "), 0, wxALIGN_CENTER | wxALL, 5);
-        
+
         static const std::vector<wxString> qual_choices = {
             _(L("Accurate")),
             _(L("Balanced")),
             _(L("Quick"))
         };
-        
+
         m_quality_dropdown = new wxComboBox(
             this, wxID_ANY, qual_choices[0], wxDefaultPosition, wxDefaultSize,
             qual_choices.size(), qual_choices.data(), wxCB_READONLY | wxCB_DROPDOWN);
         szchoices->Add(m_quality_dropdown);
-        
+
         m_import_dropdown->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &) {
             if (get_selection() == Sel::profileOnly)
                 m_quality_dropdown->Disable();
             else m_quality_dropdown->Enable();
         });
-        
+
         szvert->Add(szchoices, 0, wxALL, 5);
         szvert->AddStretchSpacer(1);
         auto szbtn = new wxBoxSizer(wxHORIZONTAL);
         szbtn->Add(new wxButton{this, wxID_CANCEL});
         szbtn->Add(new wxButton{this, wxID_OK});
         szvert->Add(szbtn, 0, wxALIGN_RIGHT | wxALL, 5);
-        
+
         SetSizerAndFit(szvert);
     }
-    
+
     Sel get_selection() const
     {
         int sel = m_import_dropdown->GetSelection();
         return Sel(std::min(int(Sel::modelOnly), std::max(0, sel)));
     }
-    
+
     Vec2i get_marchsq_windowsize() const
     {
         enum { Accurate, Balanced, Fast};
-        
+
         switch(m_quality_dropdown->GetSelection())
         {
         case Fast: return {8, 8};
@@ -102,7 +102,7 @@ public:
             return {2, 2};
         }
     }
-    
+
     wxString get_path() const
     {
         return m_filepicker->GetPath();
@@ -112,7 +112,7 @@ public:
 class SLAImportJob::priv {
 public:
     Plater *plater;
-    
+
     Sel sel = Sel::modelAndProfile;
 
     indexed_triangle_set mesh;
@@ -125,8 +125,8 @@ public:
     priv(Plater *plt) : plater{plt} {}
 };
 
-SLAImportJob::SLAImportJob(std::shared_ptr<NotificationManager> nm, Plater *plater)
-    : PlaterJob{nm, plater}, p{std::make_unique<priv>(plater)}
+SLAImportJob::SLAImportJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater)
+    : PlaterJob{std::move(pri), plater}, p{std::make_unique<priv>(plater)}
 {}
 
 SLAImportJob::~SLAImportJob() = default;
@@ -138,27 +138,27 @@ void SLAImportJob::process()
             update_status(int(s), _(L("Importing SLA archive")));
         return !was_canceled();
     };
-    
+
     if (p->path.empty()) return;
-    
+
     std::string path = p->path.ToUTF8().data();
     try {
         switch (p->sel) {
         case Sel::modelAndProfile:
-            p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr);
-            break;
         case Sel::modelOnly:
-            p->config_substitutions = import_sla_archive(path, p->win, p->mesh, progr);
+            p->config_substitutions = import_sla_archive(path, p->win, p->mesh, p->profile, progr);
             break;
         case Sel::profileOnly:
             p->config_substitutions = import_sla_archive(path, p->profile);
             break;
         }
-        
+    } catch (MissingProfileError &) {
+        p->err = _L("The SLA archive doesn't contain any presets. "
+                    "Please activate some SLA printer preset first before importing that SLA archive.").ToStdString();
     } catch (std::exception &ex) {
         p->err = ex.what();
     }
-    
+
     update_status(100, was_canceled() ? _(L("Importing canceled.")) :
                                         _(L("Importing done.")));
 }
@@ -167,7 +167,7 @@ void SLAImportJob::reset()
 {
     p->sel     = Sel::modelAndProfile;
     p->mesh    = {};
-    p->profile = {};
+    p->profile = m_plater->sla_print().full_print_config();
     p->win     = {2, 2};
     p->path.Clear();
 }
@@ -175,9 +175,9 @@ void SLAImportJob::reset()
 void SLAImportJob::prepare()
 {
     reset();
-    
+
     ImportDlg dlg{p->plater};
-    
+
     if (dlg.ShowModal() == wxID_OK) {
         auto path = dlg.get_path();
         auto nm = wxFileName(path);
@@ -194,16 +194,27 @@ void SLAImportJob::finalize()
 {
     // Ignore the arrange result if aborted.
     if (was_canceled()) return;
-    
+
     if (!p->err.empty()) {
         show_error(p->plater, p->err);
         p->err = "";
         return;
     }
-    
+
     std::string name = wxFileName(p->path).GetName().ToUTF8().data();
-    
-    if (!p->profile.empty()) {
+
+    if (p->profile.empty()) {
+        m_plater->get_notification_manager()->push_notification(
+        NotificationType::CustomNotification,
+        NotificationManager::NotificationLevel::WarningNotificationLevel,
+            _L("The imported SLA archive did not contain any presets. "
+               "The current SLA presets were used as fallback.").ToStdString());
+    }
+
+    if (p->sel != Sel::modelOnly) {
+        if (p->profile.empty())
+            p->profile = m_plater->sla_print().full_print_config();
+
         const ModelObjectPtrs& objects = p->plater->model().objects;
         for (auto object : objects)
             if (object->volumes.size() > 1)
@@ -214,15 +225,15 @@ void SLAImportJob::finalize()
                                        _(L("Attention!")) );
                 return;
             }
-        
+
         DynamicPrintConfig config = {};
         config.apply(SLAFullPrintConfig::defaults());
         config += std::move(p->profile);
-        
+
         wxGetApp().preset_bundle->load_config_model(name, std::move(config));
         wxGetApp().load_current_presets();
     }
-    
+
     if (!p->mesh.empty()) {
         bool is_centered = false;
         p->plater->sidebar().obj_list()->load_mesh_object(TriangleMesh{p->mesh},
diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.hpp b/src/slic3r/GUI/Jobs/SLAImportJob.hpp
index 7bc4d5e7e..c2ca10ef6 100644
--- a/src/slic3r/GUI/Jobs/SLAImportJob.hpp
+++ b/src/slic3r/GUI/Jobs/SLAImportJob.hpp
@@ -5,20 +5,18 @@
 
 namespace Slic3r { namespace GUI {
 
-class NotificationManager;
-
 class SLAImportJob : public PlaterJob {
     class priv;
-    
+
     std::unique_ptr<priv> p;
-    
+
 protected:
     void prepare() override;
     void process() override;
     void finalize() override;
 
 public:
-    SLAImportJob(std::shared_ptr<NotificationManager> nm, Plater *plater);
+    SLAImportJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater);
     ~SLAImportJob();
 
     void reset();
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 6d5fbf11c..66e22c694 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -222,13 +222,14 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
         }
 
         if (m_plater != nullptr) {
-            int saved_project = m_plater->save_project_if_dirty();
+            int saved_project = m_plater->save_project_if_dirty(_L("Closing PrusaSlicer. Current project is modified."));
             if (saved_project == wxID_CANCEL) {
                 event.Veto();
                 return;
             }
             // check unsaved changes only if project wasn't saved
-            else if (saved_project == wxID_NO && event.CanVeto() && !wxGetApp().check_and_save_current_preset_changes()) {
+            else if (plater()->is_project_dirty() && saved_project == wxID_NO && event.CanVeto() &&
+                     !wxGetApp().check_and_save_current_preset_changes(_L("PrusaSlicer is closing"), _L("Closing PrusaSlicer while some presets are modified."))) {
                 event.Veto();
                 return;
             }
@@ -434,8 +435,9 @@ void MainFrame::update_layout()
     {
         m_plater->Reparent(m_tabpanel);
 #ifdef _MSW_DARK_MODE
+        m_plater->Layout();
         if (!wxGetApp().tabs_as_menu())
-            dynamic_cast<Notebook*>(m_tabpanel)->InsertPage(0, m_plater, _L("Plater"), std::string("plater"));
+            dynamic_cast<Notebook*>(m_tabpanel)->InsertPage(0, m_plater, _L("Plater"), std::string("plater"), true);
         else
 #endif
         m_tabpanel->InsertPage(0, m_plater, _L("Plater"));
@@ -460,7 +462,7 @@ void MainFrame::update_layout()
         m_plater_page = new wxPanel(m_tabpanel);
 #ifdef _MSW_DARK_MODE
         if (!wxGetApp().tabs_as_menu())
-            dynamic_cast<Notebook*>(m_tabpanel)->InsertPage(0, m_plater_page, _L("Plater"), std::string("plater"));
+            dynamic_cast<Notebook*>(m_tabpanel)->InsertPage(0, m_plater_page, _L("Plater"), std::string("plater"), true);
         else
 #endif
         m_tabpanel->InsertPage(0, m_plater_page, _L("Plater")); // empty panel just for Plater tab */
@@ -618,7 +620,8 @@ void MainFrame::update_title()
         // m_plater->get_project_filename() produces file name including path, but excluding extension.
         // Don't try to remove the extension, it would remove part of the file name after the last dot!
         wxString project = from_path(into_path(m_plater->get_project_filename()).filename());
-        wxString dirty_marker = (!m_plater->model().objects.empty() && m_plater->is_project_dirty()) ? "*" : "";
+//        wxString dirty_marker = (!m_plater->model().objects.empty() && m_plater->is_project_dirty()) ? "*" : "";
+        wxString dirty_marker = m_plater->is_project_dirty() ? "*" : "";
         if (!dirty_marker.empty() || !project.empty()) {
             if (!dirty_marker.empty() && project.empty())
                 project = _L("Untitled");
@@ -820,7 +823,10 @@ bool MainFrame::is_active_and_shown_tab(Tab* tab)
 
 bool MainFrame::can_start_new_project() const
 {
-    return (m_plater != nullptr) && (!m_plater->get_project_filename(".3mf").IsEmpty() || GetTitle().StartsWith('*') || !m_plater->model().objects.empty());
+    return m_plater && (!m_plater->get_project_filename(".3mf").IsEmpty() || 
+                        GetTitle().StartsWith('*')||
+                        wxGetApp().has_current_preset_changes() || 
+                        !m_plater->model().objects.empty() );
 }
 
 bool MainFrame::can_save() const
@@ -828,7 +834,7 @@ bool MainFrame::can_save() const
 #if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED
     return (m_plater != nullptr) &&
         !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&
-        !m_plater->get_project_filename().empty() && m_plater->is_project_dirty();
+        m_plater->is_project_dirty();
 #else
     return (m_plater != nullptr) && !m_plater->model().objects.empty() &&
         !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&
@@ -852,13 +858,14 @@ void MainFrame::save_project()
     save_project_as(m_plater->get_project_filename(".3mf"));
 }
 
-void MainFrame::save_project_as(const wxString& filename)
+bool MainFrame::save_project_as(const wxString& filename)
 {
     bool ret = (m_plater != nullptr) ? m_plater->export_3mf(into_path(filename)) : false;
     if (ret) {
 //        wxGetApp().update_saved_preset_from_current_preset();
         m_plater->reset_project_dirty_after_save();
     }
+    return ret;
 }
 
 bool MainFrame::can_export_model() const
@@ -1151,8 +1158,10 @@ void MainFrame::init_menubar_as_editor()
         Bind(wxEVT_MENU, [this](wxCommandEvent& evt) {
             size_t file_id = evt.GetId() - wxID_FILE1;
             wxString filename = m_recent_projects.GetHistoryFile(file_id);
-            if (wxFileExists(filename))
-                m_plater->load_project(filename);
+            if (wxFileExists(filename)) {
+                if (wxGetApp().can_load_project())
+                    m_plater->load_project(filename);
+            }
             else
             {
                 //wxMessageDialog msg(this, _L("The selected project is no longer available.\nDo you want to remove it from the recent projects list?"), _L("Error"), wxYES_NO | wxYES_DEFAULT);
@@ -1740,7 +1749,6 @@ void MainFrame::repair_stl()
 
     Slic3r::TriangleMesh tmesh;
     tmesh.ReadSTLFile(input_file.ToUTF8().data());
-    tmesh.repair();
     tmesh.WriteOBJFile(output_file.ToUTF8().data());
     Slic3r::GUI::show_info(this, L("Your file was repaired."), L("Repair"));
 }
@@ -1773,7 +1781,7 @@ void MainFrame::export_config()
 // Load a config file containing a Print, Filament & Printer preset.
 void MainFrame::load_config_file()
 {
-    if (!wxGetApp().check_and_save_current_preset_changes())
+    if (!wxGetApp().check_and_save_current_preset_changes(_L("Loading of a configuration file"), "", false))
         return;
     wxFileDialog dlg(this, _L("Select configuration to load:"),
         !m_last_config.IsEmpty() ? get_dir_name(m_last_config) : wxGetApp().app_config->get_last_dir(),
@@ -1804,7 +1812,8 @@ bool MainFrame::load_config_file(const std::string &path)
 
 void MainFrame::export_configbundle(bool export_physical_printers /*= false*/)
 {
-    if (!wxGetApp().check_and_save_current_preset_changes())
+    if (!wxGetApp().check_and_save_current_preset_changes(_L("Exporting configuration bundle"),
+                                                          _L("Some presets are modified and the unsaved changes will not be exported into configuration bundle."), false, true))
         return;
     // validate current configuration in case it's dirty
     auto err = wxGetApp().preset_bundle->full_config().validate();
@@ -1836,7 +1845,7 @@ void MainFrame::export_configbundle(bool export_physical_printers /*= false*/)
 // but that behavior was not documented and likely buggy.
 void MainFrame::load_configbundle(wxString file/* = wxEmptyString, const bool reset_user_profile*/)
 {
-    if (!wxGetApp().check_and_save_current_preset_changes())
+    if (!wxGetApp().check_and_save_current_preset_changes(_L("Loading of a configuration bundle"), "", false))
         return;
     if (file.IsEmpty()) {
         wxFileDialog dlg(this, _L("Select configuration to load:"),
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index 487d002af..1b66a6052 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -190,7 +190,7 @@ public:
     bool can_save() const;
     bool can_save_as() const;
     void save_project();
-    void save_project_as(const wxString& filename = wxString());
+    bool save_project_as(const wxString& filename = wxString());
 
     void        add_to_recent_projects(const wxString& filename);
     void        technology_changed();
diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp
index 75232c930..0f72d0f78 100644
--- a/src/slic3r/GUI/MeshUtils.cpp
+++ b/src/slic3r/GUI/MeshUtils.cpp
@@ -91,11 +91,9 @@ void MeshClipper::recalculate_triangles()
     MeshSlicingParams slicing_params;
     slicing_params.trafo.rotate(Eigen::Quaternion<double, Eigen::DontAlign>::FromTwoVectors(up, Vec3d::UnitZ()));
 
-    assert(m_mesh->has_shared_vertices());
     ExPolygons expolys = union_ex(slice_mesh(m_mesh->its, height_mesh, slicing_params));
 
     if (m_negative_mesh && !m_negative_mesh->empty()) {
-        assert(m_negative_mesh->has_shared_vertices());
         ExPolygons neg_expolys = union_ex(slice_mesh(m_negative_mesh->its, height_mesh, slicing_params));
         expolys = diff_ex(expolys, neg_expolys);
     }
@@ -255,11 +253,10 @@ std::vector<unsigned> MeshRaycaster::get_unobscured_idxs(const Geometry::Transfo
     std::vector<unsigned> out;
 
     const Transform3d& instance_matrix_no_translation_no_scaling = trafo.get_matrix(true,false,true);
-    Vec3f direction_to_camera = -camera.get_dir_forward().cast<float>();
-    Vec3f direction_to_camera_mesh = (instance_matrix_no_translation_no_scaling.inverse().cast<float>() * direction_to_camera).normalized().eval();
-    Vec3f scaling = trafo.get_scaling_factor().cast<float>();
-    direction_to_camera_mesh = Vec3f(direction_to_camera_mesh(0)*scaling(0), direction_to_camera_mesh(1)*scaling(1), direction_to_camera_mesh(2)*scaling(2));
-    const Transform3f inverse_trafo = trafo.get_matrix().inverse().cast<float>();
+    Vec3d direction_to_camera = -camera.get_dir_forward();
+    Vec3d direction_to_camera_mesh = (instance_matrix_no_translation_no_scaling.inverse() * direction_to_camera).normalized().eval();
+    direction_to_camera_mesh = direction_to_camera_mesh.cwiseProduct(trafo.get_scaling_factor());
+    const Transform3d inverse_trafo = trafo.get_matrix().inverse();
 
     for (size_t i=0; i<points.size(); ++i) {
         const Vec3f& pt = points[i];
@@ -270,9 +267,8 @@ std::vector<unsigned> MeshRaycaster::get_unobscured_idxs(const Geometry::Transfo
         // Cast a ray in the direction of the camera and look for intersection with the mesh:
         std::vector<sla::IndexedMesh::hit_result> hits;
         // Offset the start of the ray by EPSILON to account for numerical inaccuracies.
-        hits = m_emesh.query_ray_hits((inverse_trafo * pt + direction_to_camera_mesh * EPSILON).cast<double>(),
-                                      direction_to_camera.cast<double>());
-
+        hits = m_emesh.query_ray_hits((inverse_trafo * pt.cast<double>() + direction_to_camera_mesh * EPSILON),
+                                      direction_to_camera_mesh);
 
         if (! hits.empty()) {
             // If the closest hit facet normal points in the same direction as the ray,
diff --git a/src/slic3r/GUI/MeshUtils.hpp b/src/slic3r/GUI/MeshUtils.hpp
index 65c326116..767abd7fd 100644
--- a/src/slic3r/GUI/MeshUtils.hpp
+++ b/src/slic3r/GUI/MeshUtils.hpp
@@ -30,11 +30,8 @@ public:
 
     ClippingPlane(const Vec3d& direction, double offset)
     {
-        Vec3d norm_dir = direction.normalized();
-        m_data[0] = norm_dir(0);
-        m_data[1] = norm_dir(1);
-        m_data[2] = norm_dir(2);
-        m_data[3] = offset;
+        set_normal(direction);
+        set_offset(offset);
     }
 
     bool operator==(const ClippingPlane& cp) const {
@@ -48,7 +45,13 @@ public:
     }
 
     bool is_point_clipped(const Vec3d& point) const { return distance(point) < 0.; }
-    void set_normal(const Vec3d& normal) { for (size_t i=0; i<3; ++i) m_data[i] = normal(i); }
+    void set_normal(const Vec3d& normal)
+    {
+        const Vec3d norm_dir = normal.normalized();
+        m_data[0] = norm_dir.x();
+        m_data[1] = norm_dir.y();
+        m_data[2] = norm_dir.z();
+    }
     void set_offset(double offset) { m_data[3] = offset; }
     Vec3d get_normal() const { return Vec3d(m_data[0], m_data[1], m_data[2]); }
     bool is_active() const { return m_data[3] != DBL_MAX; }
@@ -113,10 +116,8 @@ public:
     // during MeshRaycaster existence.
     MeshRaycaster(const TriangleMesh& mesh)
         : m_emesh(mesh, true) // calculate epsilon for triangle-ray intersection from an average edge length
+        , m_normals(its_face_normals(mesh.its))
     {
-        m_normals.reserve(mesh.stl.facet_start.size());
-        for (const stl_facet& facet : mesh.stl.facet_start)
-            m_normals.push_back(facet.normal);
     }
 
     void line_from_mouse_pos(const Vec2d& mouse_pos, const Transform3d& trafo, const Camera& camera,
diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp
index 56e6ddf6c..ff5020b9c 100644
--- a/src/slic3r/GUI/Notebook.hpp
+++ b/src/slic3r/GUI/Notebook.hpp
@@ -84,6 +84,9 @@ public:
             if (int page_idx = evt.GetId(); page_idx >= 0)
                 SetSelection(page_idx);
         });
+
+        this->Bind(wxEVT_NAVIGATION_KEY, &Notebook::OnNavigationKey, this);
+
         return true;
     }
 
@@ -165,8 +168,8 @@ public:
 
         GetBtnsListCtrl()->InsertPage(n, text, bSelect, bmp_name);
 
-        if (!DoSetSelectionAfterInsertion(n, bSelect))
-            page->Hide();
+        if (bSelect)
+            SetSelection(n);
 
         return true;
     }
@@ -174,7 +177,14 @@ public:
     virtual int SetSelection(size_t n) override
     {
         GetBtnsListCtrl()->SetSelection(n);
-        return DoSetSelection(n, SetSelection_SendEvent);
+        int ret = DoSetSelection(n, SetSelection_SendEvent);
+
+        // check that only the selected page is visible and others are hidden:
+        for (size_t page = 0; page < m_pages.size(); page++)
+            if (page != n)
+                m_pages[page]->Hide();
+
+        return ret;
     }
 
     virtual int ChangeSelection(size_t n) override
@@ -235,6 +245,89 @@ public:
         GetBtnsListCtrl()->Rescale();
     }
 
+    void Notebook::OnNavigationKey(wxNavigationKeyEvent& event)
+    {
+        if (event.IsWindowChange()) {
+            // change pages
+            AdvanceSelection(event.GetDirection());
+        }
+        else {
+            // we get this event in 3 cases
+            //
+            // a) one of our pages might have generated it because the user TABbed
+            // out from it in which case we should propagate the event upwards and
+            // our parent will take care of setting the focus to prev/next sibling
+            //
+            // or
+            //
+            // b) the parent panel wants to give the focus to us so that we
+            // forward it to our selected page. We can't deal with this in
+            // OnSetFocus() because we don't know which direction the focus came
+            // from in this case and so can't choose between setting the focus to
+            // first or last panel child
+            //
+            // or
+            //
+            // c) we ourselves (see MSWTranslateMessage) generated the event
+            //
+            wxWindow* const parent = GetParent();
+
+            // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE
+            const bool isFromParent = event.GetEventObject() == (wxObject*)parent;
+            const bool isFromSelf = event.GetEventObject() == (wxObject*)this;
+            const bool isForward = event.GetDirection();
+
+            if (isFromSelf && !isForward)
+            {
+                // focus is currently on notebook tab and should leave
+                // it backwards (Shift-TAB)
+                event.SetCurrentFocus(this);
+                parent->HandleWindowEvent(event);
+            }
+            else if (isFromParent || isFromSelf)
+            {
+                // no, it doesn't come from child, case (b) or (c): forward to a
+                // page but only if entering notebook page (i.e. direction is
+                // backwards (Shift-TAB) comething from out-of-notebook, or
+                // direction is forward (TAB) from ourselves),
+                if (m_selection != wxNOT_FOUND &&
+                    (!event.GetDirection() || isFromSelf))
+                {
+                    // so that the page knows that the event comes from it's parent
+                    // and is being propagated downwards
+                    event.SetEventObject(this);
+
+                    wxWindow* page = m_pages[m_selection];
+                    if (!page->HandleWindowEvent(event))
+                    {
+                        page->SetFocus();
+                    }
+                    //else: page manages focus inside it itself
+                }
+                else // otherwise set the focus to the notebook itself
+                {
+                    SetFocus();
+                }
+            }
+            else
+            {
+                // it comes from our child, case (a), pass to the parent, but only
+                // if the direction is forwards. Otherwise set the focus to the
+                // notebook itself. The notebook is always the 'first' control of a
+                // page.
+                if (!isForward)
+                {
+                    SetFocus();
+                }
+                else if (parent)
+                {
+                    event.SetCurrentFocus(this);
+                    parent->HandleWindowEvent(event);
+                }
+            }
+        }
+    }
+
 protected:
     virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) override
     {
diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp
index 0841efcb0..ed6f11ddb 100644
--- a/src/slic3r/GUI/NotificationManager.cpp
+++ b/src/slic3r/GUI/NotificationManager.cpp
@@ -43,10 +43,10 @@ const NotificationManager::NotificationData NotificationManager::basic_notificat
 	},
 	{NotificationType::NewAppAvailable, NotificationLevel::ImportantNotificationLevel, 20,  _u8L("New version is available."),  _u8L("See Releases page."), [](wxEvtHandler* evnthndlr) {
 		wxGetApp().open_browser_with_warning_dialog("https://github.com/prusa3d/PrusaSlicer/releases"); return true; }},
-	{NotificationType::EmptyColorChangeCode, NotificationLevel::RegularNotificationLevel, 10,
+	{NotificationType::EmptyColorChangeCode, NotificationLevel::PrintInfoNotificationLevel, 10,
 		_u8L("You have just added a G-code for color change, but its value is empty.\n"
 			 "To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"") },
-	{NotificationType::EmptyAutoColorChange, NotificationLevel::RegularNotificationLevel, 10,
+	{NotificationType::EmptyAutoColorChange, NotificationLevel::PrintInfoNotificationLevel, 10,
 		_u8L("No color change event was added to the print. The print does not look like a sign.") },
 	{NotificationType::DesktopIntegrationSuccess, NotificationLevel::RegularNotificationLevel, 10,
 		_u8L("Desktop integration was successful.") },
@@ -276,7 +276,10 @@ void NotificationManager::PopNotification::count_spaces()
 	m_line_height = ImGui::CalcTextSize("A").y;
 
 	m_left_indentation = m_line_height;
-	if (m_data.level == NotificationLevel::ErrorNotificationLevel || m_data.level == NotificationLevel::WarningNotificationLevel) {
+	if (m_data.level == NotificationLevel::ErrorNotificationLevel 
+		|| m_data.level == NotificationLevel::WarningNotificationLevel
+		|| m_data.level == NotificationLevel::PrintInfoNotificationLevel
+		|| m_data.level == NotificationLevel::PrintInfoShortNotificationLevel) {
 		std::string text;
 		text = (m_data.level == NotificationLevel::ErrorNotificationLevel ? ImGui::ErrorMarker : ImGui::WarningMarker);
 		float picture_width = ImGui::CalcTextSize(text.c_str()).x;
@@ -373,7 +376,7 @@ void NotificationManager::PopNotification::init()
 void NotificationManager::PopNotification::set_next_window_size(ImGuiWrapper& imgui)
 { 
 	m_window_height = m_multiline ?
-		m_lines_count * m_line_height :
+		std::max(m_lines_count, (size_t)2) * m_line_height :
 		2 * m_line_height;
 	m_window_height += 1 * m_line_height; // top and bottom
 }
@@ -511,7 +514,13 @@ void NotificationManager::PopNotification::render_left_sign(ImGuiWrapper& imgui)
 		ImGui::SetCursorPosX(m_line_height / 3);
 		ImGui::SetCursorPosY(m_window_height / 2 - m_line_height);
 		imgui.text(text.c_str());
-	} 
+	} else if (m_data.level == NotificationLevel::PrintInfoNotificationLevel || m_data.level == NotificationLevel::PrintInfoShortNotificationLevel) {
+		std::wstring text;
+		text = ImGui::InfoMarker;
+		ImGui::SetCursorPosX(m_line_height / 3);
+		ImGui::SetCursorPosY(m_window_height / 2 - m_line_height);
+		imgui.text(text.c_str());
+	}
 }
 void NotificationManager::PopNotification::render_minimize_button(ImGuiWrapper& imgui, const float win_pos_x, const float win_pos_y)
 {
@@ -593,7 +602,7 @@ bool NotificationManager::PopNotification::update_state(bool paused, const int64
 		m_state = EState::Unknown;
 		init();
 	// Timers when not fading
-	} else if (m_state != EState::NotFading && m_state != EState::FadingOut && get_duration() != 0 && !paused) {
+	} else if (m_state != EState::NotFading && m_state != EState::FadingOut && m_state != EState::ClosePending && m_state != EState::Finished && get_duration() != 0 && !paused) {
 		int64_t up_time = now - m_notification_start;
 		if (up_time >= get_duration() * 1000) {
 			m_state					= EState::FadingOut;
@@ -633,6 +642,10 @@ bool NotificationManager::PopNotification::update_state(bool paused, const int64
 //---------------ExportFinishedNotification-----------
 void NotificationManager::ExportFinishedNotification::count_spaces()
 {
+	if (m_eject_pending)
+	{
+		return PopNotification::count_spaces();
+	}
 	//determine line width 
 	m_line_height = ImGui::CalcTextSize("A").y;
 
@@ -650,7 +663,10 @@ void NotificationManager::ExportFinishedNotification::count_spaces()
 
 void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
-	
+	if (m_eject_pending)
+	{
+		return PopNotification::render_text(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
+	}
 	float       x_offset = m_left_indentation;
 	std::string fulltext = m_text1 + m_hypertext; //+ m_text2;
 	// Lines are always at least two and m_multiline is always true for ExportFinishedNotification.
@@ -669,7 +685,7 @@ void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper&
 			ImGui::SetCursorPosY(starting_y + i * shift_y);
 			imgui.text(line.c_str());
 			//hyperlink text
-			if ( i == 0 )  {
+			if ( i == 0 && !m_eject_pending)  {
 				render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x + ImGui::CalcTextSize("   ").x, starting_y, _u8L("Open Folder."));
 			}
 		}
@@ -680,7 +696,7 @@ void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper&
 void NotificationManager::ExportFinishedNotification::render_close_button(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
 	PopNotification::render_close_button(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
-	if(m_to_removable)
+	if(m_to_removable && ! m_eject_pending)
 		render_eject_button(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
 }
 
@@ -725,7 +741,7 @@ void NotificationManager::ExportFinishedNotification::render_eject_button(ImGuiW
 		assert(m_evt_handler != nullptr);
 		if (m_evt_handler != nullptr)
 			wxPostEvent(m_evt_handler, EjectDriveNotificationClickedEvent(EVT_EJECT_DRIVE_NOTIFICAION_CLICKED));
-		close();
+		on_eject_click();
 	}
 
 	//invisible large button
@@ -736,7 +752,7 @@ void NotificationManager::ExportFinishedNotification::render_eject_button(ImGuiW
 		assert(m_evt_handler != nullptr);
 		if (m_evt_handler != nullptr)
 			wxPostEvent(m_evt_handler, EjectDriveNotificationClickedEvent(EVT_EJECT_DRIVE_NOTIFICAION_CLICKED));
-		close();
+		on_eject_click();
 	}
 	ImGui::PopStyleColor(5);
 }
@@ -745,6 +761,14 @@ bool NotificationManager::ExportFinishedNotification::on_text_click()
 	open_folder(m_export_dir_path);
 	return false;
 }
+void NotificationManager::ExportFinishedNotification::on_eject_click()
+{
+	NotificationData data{ get_data().type, get_data().level , 0, _utf8("Ejecting.") };
+	m_eject_pending = true;
+	m_multiline = false;
+	update(data);
+}
+
 //------ProgressBar----------------
 void NotificationManager::ProgressBarNotification::init()
 {
@@ -1040,6 +1064,8 @@ void NotificationManager::UpdatedItemsInfoNotification::add_type(InfoItemType ty
 
 	std::string text;
 	for (it = m_types_and_counts.begin(); it != m_types_and_counts.end(); ++it) {
+		if ((*it).second == 0)
+			continue;
 		text += std::to_string((*it).second);
 		text += _L_PLURAL(" Object was loaded with "," Objects were loaded with ", (*it).second).ToUTF8().data();
 		switch ((*it).first) {
@@ -1051,6 +1077,7 @@ void NotificationManager::UpdatedItemsInfoNotification::add_type(InfoItemType ty
 		default: BOOST_LOG_TRIVIAL(error) << "Unknown InfoItemType: " << (*it).second; break;
 		}
 	}
+	m_state = EState::Unknown;
 	NotificationData data { get_data().type, get_data().level , get_data().duration, text };
 	update(data);
 }
@@ -1071,7 +1098,7 @@ void NotificationManager::UpdatedItemsInfoNotification::render_left_sign(ImGuiWr
 	imgui.text(text.c_str());
 }
 
-//------SlicingProgressNotificastion
+//------SlicingProgressNotification
 void NotificationManager::SlicingProgressNotification::init()
 {
 	if (m_sp_state == SlicingProgressState::SP_PROGRESS) {
@@ -1084,46 +1111,53 @@ void NotificationManager::SlicingProgressNotification::init()
 	}
 
 }
-void NotificationManager::SlicingProgressNotification::set_progress_state(float percent)
+bool NotificationManager::SlicingProgressNotification::set_progress_state(float percent)
 {
 	if (percent < 0.f)
-		set_progress_state(SlicingProgressState::SP_CANCELLED);
+		return true;//set_progress_state(SlicingProgressState::SP_CANCELLED);
 	else if (percent >= 1.f)
-		set_progress_state(SlicingProgressState::SP_COMPLETED);
+		return set_progress_state(SlicingProgressState::SP_COMPLETED);
 	else 
-		set_progress_state(SlicingProgressState::SP_PROGRESS, percent);
+		return set_progress_state(SlicingProgressState::SP_PROGRESS, percent);
 }
-void NotificationManager::SlicingProgressNotification::set_progress_state(NotificationManager::SlicingProgressNotification::SlicingProgressState state, float percent/* = 0.f*/)
+bool NotificationManager::SlicingProgressNotification::set_progress_state(NotificationManager::SlicingProgressNotification::SlicingProgressState state, float percent/* = 0.f*/)
 {
 	switch (state)
 	{
 	case Slic3r::GUI::NotificationManager::SlicingProgressNotification::SlicingProgressState::SP_NO_SLICING:
+	case Slic3r::GUI::NotificationManager::SlicingProgressNotification::SlicingProgressState::SP_BEGAN:
 		m_state = EState::Hidden;
 		set_percentage(-1);
 		m_has_print_info = false;
 		set_export_possible(false);
-		break;
+		m_sp_state = state;
+		return true;
 	case Slic3r::GUI::NotificationManager::SlicingProgressNotification::SlicingProgressState::SP_PROGRESS:
+		if ((m_sp_state != SlicingProgressState::SP_BEGAN && m_sp_state != SlicingProgressState::SP_PROGRESS) || percent < m_percentage)
+			return false;
 		set_percentage(percent);
 		m_has_cancel_button = true;
-		break;
+		m_sp_state = state;
+		return true;
 	case Slic3r::GUI::NotificationManager::SlicingProgressNotification::SlicingProgressState::SP_CANCELLED:
 		set_percentage(-1);
 		m_has_cancel_button = false;
 		m_has_print_info = false;
 		set_export_possible(false);
-		break;
+		m_sp_state = state;
+		return true;
 	case Slic3r::GUI::NotificationManager::SlicingProgressNotification::SlicingProgressState::SP_COMPLETED:
 		set_percentage(1);
 		m_has_cancel_button = false;
 		m_has_print_info = false;
-		// m_export_possible is important only for PROGRESS state, thus we can reset it here
+		// m_export_possible is important only for SP_PROGRESS state, thus we can reset it here
 		set_export_possible(false);
-		break;
+		m_sp_state = state;
+		return true;
 	default:
 		break;
 	}
-	m_sp_state = state;
+	return false;
 }
 void NotificationManager::SlicingProgressNotification::set_status_text(const std::string& text)
 {
@@ -1169,22 +1203,24 @@ void NotificationManager::SlicingProgressNotification::set_print_info(const std:
 void NotificationManager::SlicingProgressNotification::set_sidebar_collapsed(bool collapsed) 
 {
 	m_sidebar_collapsed = collapsed;
-	if (m_sp_state == SlicingProgressState::SP_COMPLETED)
-		m_state = EState::Shown;
+	if (m_sp_state == SlicingProgressState::SP_COMPLETED && collapsed)
+		m_state = EState::NotFading;
 }
 
 void NotificationManager::SlicingProgressNotification::on_cancel_button()
 {
 	if (m_cancel_callback){
-		m_cancel_callback();
+		if (!m_cancel_callback()) {
+			set_progress_state(SlicingProgressState::SP_NO_SLICING);
+		}
 	}
 }
 int NotificationManager::SlicingProgressNotification::get_duration()
 {
 	if (m_sp_state == SlicingProgressState::SP_CANCELLED)
-		return 10;
+		return 2;
 	else if (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed)
-		return 5;
+		return 2;
 	else
 		return 0;
 }
@@ -1198,7 +1234,7 @@ bool  NotificationManager::SlicingProgressNotification::update_state(bool paused
 }
 void NotificationManager::SlicingProgressNotification::render_text(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
-	if (m_sp_state == SlicingProgressState::SP_PROGRESS || (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed)) {
+	if (m_sp_state == SlicingProgressState::SP_PROGRESS /*|| (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed)*/) {
 		ProgressBarNotification::render_text(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
 		/* // enable for hypertext during slicing (correct call of export_enabled needed)
 		if (m_multiline) {
@@ -1233,7 +1269,7 @@ void NotificationManager::SlicingProgressNotification::render_text(ImGuiWrapper&
 			render_bar(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
 		}
 		*/
-	} else if (m_sp_state == SlicingProgressState::SP_COMPLETED) {
+	} else if (m_sp_state == SlicingProgressState::SP_COMPLETED && m_sidebar_collapsed) {
 		// "Slicing Finished" on line 1 + hypertext, print info on line
 		ImVec2 win_size(win_size_x, win_size_y);
 		ImVec2 text1_size = ImGui::CalcTextSize(m_text1.c_str());
@@ -1258,21 +1294,18 @@ void NotificationManager::SlicingProgressNotification::render_text(ImGuiWrapper&
 		PopNotification::render_text(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
 	}
 }
-void NotificationManager::SlicingProgressNotification::render_bar(ImGuiWrapper& imgui,  const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
+void NotificationManager::SlicingProgressNotification::render_bar(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
-	if (!(m_sp_state == SlicingProgressState::SP_PROGRESS || (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed))) {
+	if (m_sp_state != SlicingProgressState::SP_PROGRESS) {
 		return;
 	}
-	//std::string text;
 	ProgressBarNotification::render_bar(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
-	/*
-	std::stringstream stream;
-	stream << std::fixed << std::setprecision(2) << (int)(m_percentage * 100) << "%";
-	text = stream.str();
-	ImGui::SetCursorPosX(m_left_indentation);
-	ImGui::SetCursorPosY(win_size_y / 2 + win_size_y / 6 - (m_multiline ? 0 : m_line_height / 4));
-	imgui.text(text.c_str());
-	*/
+}
+void  NotificationManager::SlicingProgressNotification::render_hypertext(ImGuiWrapper& imgui,const float text_x, const float text_y, const std::string text, bool more)
+{
+	if (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed) 
+		return;
+	ProgressBarNotification::render_hypertext(imgui, text_x, text_y, text, more);
 }
 void NotificationManager::SlicingProgressNotification::render_cancel_button(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
 {
@@ -1358,7 +1391,7 @@ void NotificationManager::ProgressIndicatorNotification::init()
 		m_state = EState::NotFading;
 		break;
 	case Slic3r::GUI::NotificationManager::ProgressIndicatorNotification::ProgressIndicatorState::PIS_COMPLETED:
-		m_state = EState::Shown;
+		m_state = EState::ClosePending;
 		break;
 	default:
 		break;
@@ -1372,7 +1405,7 @@ void NotificationManager::ProgressIndicatorNotification::set_percentage(float pe
 		m_has_cancel_button = true;
 		m_progress_state = ProgressIndicatorState::PIS_PROGRESS_REQUEST;
 	} else if (percent >= 1.0f) {
-		m_state = EState::Shown;
+		m_state = EState::FadingOut;
 		m_progress_state = ProgressIndicatorState::PIS_COMPLETED;
 		m_has_cancel_button = false;
 	} else {
@@ -1386,6 +1419,7 @@ bool NotificationManager::ProgressIndicatorNotification::update_state(bool pause
 		// percentage was changed (and it called schedule_extra_frame), now update must know this needs render
 		m_next_render = 0;
 		m_progress_state = ProgressIndicatorState::PIS_PROGRESS_UPDATED;
+		m_current_fade_opacity = 1.0f;
 		return true;
 	}
 	bool ret = ProgressBarNotification::update_state(paused, delta);
@@ -1467,17 +1501,7 @@ void NotificationManager::push_notification(NotificationType type,
                                             std::function<bool(wxEvtHandler*)> callback,
                                             int timestamp)
 {
-	int duration = 0;
-	switch (level) {
-	case NotificationLevel::RegularNotificationLevel: 	 duration = 10; break;
-	case NotificationLevel::ErrorNotificationLevel: 		 break;
-	case NotificationLevel::WarningNotificationLevel:		 break;
-	case NotificationLevel::ImportantNotificationLevel: 	 break;
-	case NotificationLevel::ProgressBarNotificationLevel:    break;
-	default:
-		assert(false);
-		return;
-	}
+	int duration = get_standart_duration(level);
     push_notification_data({ type, level, duration, text, hypertext, callback }, timestamp);
 }
 void NotificationManager::push_validate_error_notification(const std::string& text)
@@ -1496,7 +1520,7 @@ void NotificationManager::push_slicing_warning_notification(const std::string& t
 {
 	NotificationData data { NotificationType::SlicingWarning, NotificationLevel::WarningNotificationLevel, 0,  _u8L("WARNING:") + "\n" + text };
 
-	auto notification = std::make_unique<NotificationManager::SlicingWarningNotification>(data, m_id_provider, m_evt_handler);
+	auto notification = std::make_unique<NotificationManager::ObjectIDNotification>(data, m_id_provider, m_evt_handler);
 	notification->object_id = oid;
 	notification->warning_step = warning_step;
 	if (push_notification_data(std::move(notification), 0)) {
@@ -1587,12 +1611,11 @@ void NotificationManager::close_slicing_error_notification(const std::string& te
 		}
 	}
 }
-void  NotificationManager::push_object_warning_notification(const std::string& text, ObjectID object_id, const std::string& hypertext/* = ""*/, std::function<bool(wxEvtHandler*)> callback/* = std::function<bool(wxEvtHandler*)>()*/)
+void  NotificationManager::push_simplify_suggestion_notification(const std::string& text, ObjectID object_id, const std::string& hypertext/* = ""*/, std::function<bool(wxEvtHandler*)> callback/* = std::function<bool(wxEvtHandler*)>()*/)
 {
-	NotificationData data{ NotificationType::ObjectWarning, NotificationLevel::WarningNotificationLevel, 0,  text, hypertext, callback };
-	auto notification = std::make_unique<NotificationManager::SlicingWarningNotification>(data, m_id_provider, m_evt_handler);
+	NotificationData data{ NotificationType::SimplifySuggestion, NotificationLevel::PrintInfoNotificationLevel, 10,  text, hypertext, callback };
+	auto notification = std::make_unique<NotificationManager::ObjectIDNotification>(data, m_id_provider, m_evt_handler);
 	notification->object_id = object_id;
-	notification->warning_step = 0;
 	push_notification_data(std::move(notification), 0);
 }
 void NotificationManager::close_notification_of_type(const NotificationType type)
@@ -1608,24 +1631,35 @@ void NotificationManager::remove_slicing_warnings_of_released_objects(const std:
 	for (std::unique_ptr<PopNotification> &notification : m_pop_notifications)
 		if (notification->get_type() == NotificationType::SlicingWarning) {
 			if (! std::binary_search(living_oids.begin(), living_oids.end(),
-				static_cast<SlicingWarningNotification*>(notification.get())->object_id))
+				static_cast<ObjectIDNotification*>(notification.get())->object_id))
 				notification->close();
 		}
 }
-void NotificationManager::remove_object_warnings_of_released_objects(const std::vector<ObjectID>& living_oids)
+void NotificationManager::remove_simplify_suggestion_of_released_objects(const std::vector<ObjectID>& living_oids)
 {
 	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications)
-		if (notification->get_type() == NotificationType::ObjectWarning) {
+		if (notification->get_type() == NotificationType::SimplifySuggestion) {
 			if (!std::binary_search(living_oids.begin(), living_oids.end(),
-				static_cast<SlicingWarningNotification*>(notification.get())->object_id))
+				static_cast<ObjectIDNotification*>(notification.get())->object_id))
 				notification->close();
 		}
 }
+
+void NotificationManager::remove_simplify_suggestion_with_id(const ObjectID oid)
+{
+	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications)
+		if (notification->get_type() == NotificationType::SimplifySuggestion) {
+			if (static_cast<ObjectIDNotification*>(notification.get())->object_id == oid)
+				notification->close();
+		}
+}
+
 void NotificationManager::push_exporting_finished_notification(const std::string& path, const std::string& dir_path, bool on_removable)
 {
 	close_notification_of_type(NotificationType::ExportFinished);
 	NotificationData data{ NotificationType::ExportFinished, NotificationLevel::RegularNotificationLevel, on_removable ? 0 : 20,  _u8L("Exporting finished.") + "\n" + path };
 	push_notification_data(std::make_unique<NotificationManager::ExportFinishedNotification>(data, m_id_provider, m_evt_handler, on_removable, path, dir_path), 0);
+	set_slicing_progress_hidden();
 }
 
 void  NotificationManager::push_upload_job_notification(int id, float filesize, const std::string& filename, const std::string& host, float percentage)
@@ -1681,7 +1715,7 @@ void NotificationManager::upload_job_notification_show_error(int id, const std::
 	}
 }
 
-void NotificationManager::init_slicing_progress_notification(std::function<void()> cancel_callback)
+void NotificationManager::init_slicing_progress_notification(std::function<bool()> cancel_callback)
 {
 	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications) {
 		if (notification->get_type() == NotificationType::SlicingProgress) {
@@ -1698,12 +1732,39 @@ void NotificationManager::init_slicing_progress_notification(std::function<void(
 	};
 	push_notification_data(std::make_unique<NotificationManager::SlicingProgressNotification>(data, m_id_provider, m_evt_handler, cancel_callback), 0);
 }
+void NotificationManager::set_slicing_progress_began()
+{
+	for (std::unique_ptr<PopNotification> & notification : m_pop_notifications) {
+		if (notification->get_type() == NotificationType::SlicingProgress) {
+			SlicingProgressNotification* spn = dynamic_cast<SlicingProgressNotification*>(notification.get());
+			spn->set_progress_state(SlicingProgressNotification::SlicingProgressState::SP_BEGAN);
+			return;
+		}
+	}
+	// Slicing progress notification was not found - init it thru plater so correct cancel callback function is appended
+	wxGetApp().plater()->init_notification_manager();
+}
 void NotificationManager::set_slicing_progress_percentage(const std::string& text, float percentage)
 {
 	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications) {
 		if (notification->get_type() == NotificationType::SlicingProgress) {
 			SlicingProgressNotification* spn = dynamic_cast<SlicingProgressNotification*>(notification.get());
-			spn->set_progress_state(percentage);
+			if(spn->set_progress_state(percentage)) {
+				spn->set_status_text(text);
+				wxGetApp().plater()->get_current_canvas3D()->schedule_extra_frame(0);
+			}
+			return;
+		}
+	}
+	// Slicing progress notification was not found - init it thru plater so correct cancel callback function is appended
+	wxGetApp().plater()->init_notification_manager();
+}
+void NotificationManager::set_slicing_progress_canceled(const std::string& text)
+{
+	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications) {
+		if (notification->get_type() == NotificationType::SlicingProgress) {
+			SlicingProgressNotification* spn = dynamic_cast<SlicingProgressNotification*>(notification.get());
+			spn->set_progress_state(SlicingProgressNotification::SlicingProgressState::SP_CANCELLED);
 			spn->set_status_text(text);
 			wxGetApp().plater()->get_current_canvas3D()->schedule_extra_frame(0);
 			return;
@@ -1712,7 +1773,6 @@ void NotificationManager::set_slicing_progress_percentage(const std::string& tex
 	// Slicing progress notification was not found - init it thru plater so correct cancel callback function is appended
 	wxGetApp().plater()->init_notification_manager();
 }
-
 void NotificationManager::set_slicing_progress_hidden()
 {
 	for (std::unique_ptr<PopNotification>& notification : m_pop_notifications) {
@@ -1770,7 +1830,7 @@ void NotificationManager::init_progress_indicator()
 			return;
 		}
 	}
-	NotificationData data{ NotificationType::ProgressIndicator, NotificationLevel::ProgressBarNotificationLevel, 2};
+	NotificationData data{ NotificationType::ProgressIndicator, NotificationLevel::ProgressBarNotificationLevel, 1};
 	auto notification = std::make_unique<NotificationManager::ProgressIndicatorNotification>(data, m_id_provider, m_evt_handler);
 	push_notification_data(std::move(notification), 0);
 }
@@ -1872,7 +1932,7 @@ void NotificationManager::push_updated_item_info_notification(InfoItemType type)
 		}
 	}
 
-	NotificationData data{ NotificationType::UpdatedItemsInfo, NotificationLevel::RegularNotificationLevel, 5, "" };
+	NotificationData data{ NotificationType::UpdatedItemsInfo, NotificationLevel::PrintInfoNotificationLevel, 10, "" };
 	auto notification = std::make_unique<NotificationManager::UpdatedItemsInfoNotification>(data, m_id_provider, m_evt_handler, type);
 	if (push_notification_data(std::move(notification), 0)) {
 		(dynamic_cast<UpdatedItemsInfoNotification*>(m_pop_notifications.back().get()))->add_type(type);
@@ -2035,8 +2095,8 @@ bool NotificationManager::activate_existing(const NotificationManager::PopNotifi
 					continue;
 				}
 			} else if (new_type == NotificationType::SlicingWarning) {
-				auto w1 = dynamic_cast<const SlicingWarningNotification*>(notification);
-				auto w2 = dynamic_cast<const SlicingWarningNotification*>(it->get());
+				auto w1 = dynamic_cast<const ObjectIDNotification*>(notification);
+				auto w2 = dynamic_cast<const ObjectIDNotification*>(it->get());
 				if (w1 != nullptr && w2 != nullptr) {
 					if (!(*it)->compare_text(new_text) || w1->object_id != w2->object_id) {
 						continue;
diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp
index 76dc9a688..ad2e315b7 100644
--- a/src/slic3r/GUI/NotificationManager.hpp
+++ b/src/slic3r/GUI/NotificationManager.hpp
@@ -71,9 +71,6 @@ enum class NotificationType
 	PlaterError,
 	// Object fully outside the print volume, or extrusion outside the print volume. Slicing is not disabled.
 	PlaterWarning,
-	// Warning connected to single object id, appears at loading object, disapears at deletition.
-	// Example: advice to simplify object with big amount of triangles.
-	ObjectWarning,
 	// Progress bar instead of text.
 	ProgressBar,
 	// Progress bar with info from Print Host Upload Queue dialog.
@@ -105,7 +102,12 @@ enum class NotificationType
 	// Might contain logo taken from gizmos
 	UpdatedItemsInfo,
 	// Progress bar notification with methods to replace ProgressIndicator class.
-	ProgressIndicator
+	ProgressIndicator,
+	// Give user advice to simplify object with big amount of triangles
+	// Contains ObjectID for closing when object is deleted
+	SimplifySuggestion,
+	//  information about netfabb is finished repairing model (blocking proccess)
+	NetfabbFinished
 };
 
 class NotificationManager
@@ -121,6 +123,10 @@ public:
 		HintNotificationLevel,
 		// "Good to know" notification, usually but not always with a quick fade-out.		
 		RegularNotificationLevel,
+		// Regular level notifiaction containing info about objects or print. Has Icon.
+		PrintInfoNotificationLevel,
+		// PrintInfoNotificationLevel with shorter time
+		PrintInfoShortNotificationLevel,
 		// Information notification without a fade-out or with a longer fade-out.
 		ImportantNotificationLevel,
 		// Warning, no fade-out.
@@ -167,11 +173,12 @@ public:
 	void close_plater_error_notification(const std::string& text);
 	void close_plater_warning_notification(const std::string& text);
 	// Object warning with ObjectID, closes when object is deleted. ID used is of object not print like in slicing warning.
-	void push_object_warning_notification(const std::string& text, ObjectID object_id, const std::string& hypertext = "",
+	void push_simplify_suggestion_notification(const std::string& text, ObjectID object_id, const std::string& hypertext = "",
 		std::function<bool(wxEvtHandler*)> callback = std::function<bool(wxEvtHandler*)>());
 	// Close object warnings, whose ObjectID is not in the list.
 	// living_oids is expected to be sorted.
-	void remove_object_warnings_of_released_objects(const std::vector<ObjectID>& living_oids);
+	void remove_simplify_suggestion_of_released_objects(const std::vector<ObjectID>& living_oids);
+	void remove_simplify_suggestion_with_id(const ObjectID oid);
 	// Called when the side bar changes its visibility, as the "slicing complete" notification supplements
 	// the "slicing info" normally shown at the side bar.
 	void set_sidebar_collapsed(bool collapsed);
@@ -188,9 +195,11 @@ public:
 	void upload_job_notification_show_canceled(int id, const std::string& filename, const std::string& host);
 	void upload_job_notification_show_error(int id, const std::string& filename, const std::string& host);
 	// slicing progress
-	void init_slicing_progress_notification(std::function<void()> cancel_callback);
+	void init_slicing_progress_notification(std::function<bool()> cancel_callback);
+	void set_slicing_progress_began();
 	// percentage negative = canceled, <0-1) = progress, 1 = completed 
 	void set_slicing_progress_percentage(const std::string& text, float percentage);
+	void set_slicing_progress_canceled(const std::string& text);
 	// hides slicing progress notification imidietly
 	void set_slicing_progress_hidden();
 	// Add a print time estimate to an existing SlicingProgress notification. Set said notification to SP_COMPLETED state.
@@ -210,6 +219,7 @@ public:
 	bool is_hint_notification_open();
 	// Forces Hints to reload its content when next hint should be showed
 	void deactivate_loaded_hints();
+	// Adds counter to existing UpdatedItemsInfo notification or opens new one
 	void push_updated_item_info_notification(InfoItemType type);
 	// Close old notification ExportFinished.
 	void new_export_began(bool on_removable);
@@ -392,12 +402,14 @@ private:
 
 	
 
-	class SlicingWarningNotification : public PopNotification
+	class ObjectIDNotification : public PopNotification
 	{
 	public:
-		SlicingWarningNotification(const NotificationData& n, NotificationIDProvider& id_provider, wxEvtHandler* evt_handler) : PopNotification(n, id_provider, evt_handler) {}
+		ObjectIDNotification(const NotificationData& n, NotificationIDProvider& id_provider, wxEvtHandler* evt_handler) 
+			: PopNotification(n, id_provider, evt_handler) 
+		{}
 		ObjectID 	object_id;
-		int    		warning_step;
+		int    		warning_step { 0 };
 	};
 
 	class PlaterWarningNotification : public PopNotification
@@ -492,11 +504,12 @@ private:
 		enum class SlicingProgressState
 		{
 			SP_NO_SLICING, // hidden
+			SP_BEGAN, // still hidden but allows to go to SP_PROGRESS state. This prevents showing progress after slicing was canceled.
 			SP_PROGRESS, // never fades outs, no close button, has cancel button
 			SP_CANCELLED, // fades after 10 seconds, simple message
 			SP_COMPLETED // Has export hyperlink and print info, fades after 20 sec if sidebar is shown, otherwise no fade out
 		};
-		SlicingProgressNotification(const NotificationData& n, NotificationIDProvider& id_provider, wxEvtHandler* evt_handler, std::function<void()> callback)
+		SlicingProgressNotification(const NotificationData& n, NotificationIDProvider& id_provider, wxEvtHandler* evt_handler, std::function<bool()> callback)
 		: ProgressBarNotification(n, id_provider, evt_handler)
 		, m_cancel_callback(callback)
 		{
@@ -507,12 +520,12 @@ private:
 		// sets text of notification - call after setting progress state
 		void				set_status_text(const std::string& text);
 		// sets cancel button callback
-		void			    set_cancel_callback(std::function<void()> callback) { m_cancel_callback = callback; }
+		void			    set_cancel_callback(std::function<bool()> callback) { m_cancel_callback = callback; }
 		bool                has_cancel_callback() const { return m_cancel_callback != nullptr; }
-		// sets SlicingProgressState, negative percent means canceled
-		void				set_progress_state(float percent);
-		// sets SlicingProgressState, percent is used only at progress state.
-		void				set_progress_state(SlicingProgressState state,float percent = 0.f);
+		// sets SlicingProgressState, negative percent means canceled, returns true if state was set succesfully.
+		bool				set_progress_state(float percent);
+		// sets SlicingProgressState, percent is used only at progress state. Returns true if state was set succesfully.
+		bool				set_progress_state(SlicingProgressState state,float percent = 0.f);
 		// sets additional string of print info and puts notification into Completed state.
 		void			    set_print_info(const std::string& info);
 		// sets fading if in Completed state.
@@ -541,11 +554,16 @@ private:
 											const float win_size_x, const float win_size_y,
 											const float win_pos_x, const float win_pos_y) override;
 		void		render_close_button(ImGuiWrapper& imgui,
-									const float win_size_x, const float win_size_y,
-									const float win_pos_x, const float win_pos_y) override;
+										const float win_size_x, const float win_size_y,
+										const float win_pos_x, const float win_pos_y) override;
+		void		render_hypertext(ImGuiWrapper& imgui,
+										const float text_x, const float text_y,
+										const std::string text,
+										bool more = false) override ;
 		void       on_cancel_button();
 		int		   get_duration() override;
-		std::function<void()>	m_cancel_callback;
+		// if returns false, process was already canceled
+		std::function<bool()>	m_cancel_callback;
 		SlicingProgressState	m_sp_state { SlicingProgressState::SP_PROGRESS };
 		bool				    m_has_print_info { false };
 		std::string             m_print_info;
@@ -625,8 +643,10 @@ private:
 		void render_minimize_button(ImGuiWrapper& imgui, const float win_pos_x, const float win_pos_y) override
 			{ m_minimize_b_visible = false; }
 		bool on_text_click() override;
+		void on_eject_click();
 		// local time of last hover for showing tooltip
 		long      m_hover_time { 0 };
+		bool	  m_eject_pending { false };
 	};
 
 	class UpdatedItemsInfoNotification : public PopNotification
@@ -639,6 +659,11 @@ private:
 		}
 		void count_spaces() override;
 		void add_type(InfoItemType type);
+		void close() override{ 
+			for (auto& tac : m_types_and_counts)
+				tac.second = 0;
+			PopNotification::close(); 
+		}
 	protected:
 		void render_left_sign(ImGuiWrapper& imgui) override;
 		std::vector<std::pair<InfoItemType, size_t>> m_types_and_counts;
@@ -681,7 +706,22 @@ private:
 	void sort_notifications();
 	// If there is some error notification active, then the "Export G-code" notification after the slicing is finished is suppressed.
     bool has_slicing_error_notification();
-    
+	size_t get_standart_duration(NotificationLevel level)
+	{
+		switch (level) {
+		
+		case NotificationLevel::ErrorNotificationLevel: 			return 0;
+		case NotificationLevel::WarningNotificationLevel:			return 0;
+		case NotificationLevel::ImportantNotificationLevel:			return 0;
+		case NotificationLevel::ProgressBarNotificationLevel:		return 2;
+		case NotificationLevel::PrintInfoShortNotificationLevel:	return 5;
+		case NotificationLevel::RegularNotificationLevel: 			return 10;
+		case NotificationLevel::PrintInfoNotificationLevel:			return 10;
+		case NotificationLevel::HintNotificationLevel:				return 300;
+		default: return 10;
+		}
+	}
+
 	// set by init(), until false notifications are only added not updated and frame is not requested after push
 	bool m_initialized{ false };
 	// Target for wxWidgets events sent by clicking on the hyperlink available at some notifications.
@@ -705,7 +745,7 @@ private:
 		NotificationType::PlaterWarning, 
 		NotificationType::ProgressBar, 
 		NotificationType::PrintHostUpload, 
-        NotificationType::ObjectWarning
+        NotificationType::SimplifySuggestion
 	};
 	//prepared (basic) notifications
 	static const NotificationData basic_notifications[];
diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
index 928249e5b..ed4b477b8 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.cpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -37,7 +37,7 @@ void ObjectDataViewModelNode::init_container()
 static constexpr char LayerRootIcon[]   = "edit_layers_all";
 static constexpr char LayerIcon[]       = "edit_layers_some";
 static constexpr char WarningIcon[]     = "exclamation";
-static constexpr char InfoIcon[]        = "objlist_info";
+static constexpr char WarningManifoldIcon[] = "exclamation_manifold";
 
 struct InfoItemAtributes {
     std::string name;
@@ -58,13 +58,15 @@ ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode*   pare
                                                  Slic3r::ModelVolumeType    type,
                                                  const wxBitmap&            bmp,
                                                  const wxString&            extruder,
-                                                 const int                  idx/* = -1*/) :
+                                                 const int                  idx/* = -1*/,
+                                                 const std::string&         warning_icon_name /*= std::string*/) :
     m_parent(parent),
     m_name(sub_obj_name),
     m_type(itVolume),
     m_volume_type(type),
     m_idx(idx),
-    m_extruder(type == Slic3r::ModelVolumeType::MODEL_PART || type == Slic3r::ModelVolumeType::PARAMETER_MODIFIER ? extruder : "")
+    m_extruder(type == Slic3r::ModelVolumeType::MODEL_PART || type == Slic3r::ModelVolumeType::PARAMETER_MODIFIER ? extruder : ""),
+    m_warning_icon_name(warning_icon_name)
 {
     m_bmp = bmp;
     set_action_and_extruder_icons();
@@ -171,6 +173,13 @@ void ObjectDataViewModelNode::set_printable_icon(PrintIndicator printable)
                        create_scaled_bitmap(m_printable == piPrintable ? "eye_open.png" : "eye_closed.png");
 }
 
+void ObjectDataViewModelNode::set_warning_icon(const std::string& warning_icon_name)
+{
+    m_warning_icon_name = warning_icon_name;
+    if (warning_icon_name.empty())
+        m_bmp = m_empty_bmp;
+}
+
 void ObjectDataViewModelNode::update_settings_digest_bitmaps()
 {
     m_bmp = m_empty_bmp;
@@ -317,6 +326,8 @@ ObjectDataViewModel::ObjectDataViewModel()
 
     m_volume_bmps = MenuFactory::get_volume_bitmaps();
     m_warning_bmp = create_scaled_bitmap(WarningIcon);
+    m_warning_manifold_bmp = create_scaled_bitmap(WarningManifoldIcon);
+
     for (auto item : INFO_ITEMS)
         m_info_bmps[item.first] = create_scaled_bitmap(item.second.bmp_name);
 }
@@ -329,15 +340,19 @@ ObjectDataViewModel::~ObjectDataViewModel()
     m_bitmap_cache = nullptr;
 }
 
+wxBitmap& ObjectDataViewModel::GetWarningBitmap(const std::string& warning_icon_name)
+{
+    return warning_icon_name.empty() ? m_empty_bmp : warning_icon_name == WarningIcon ? m_warning_bmp : m_warning_manifold_bmp;
+}
+
 wxDataViewItem ObjectDataViewModel::Add(const wxString &name, 
                                         const int extruder,
-                                        const bool has_errors/* = false*/)
+                                        const std::string& warning_icon_name/* = std::string()*/ )
 {
-    const wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
+    const wxString extruder_str = extruder == 0 ? _L("default") : wxString::Format("%d", extruder);
 	auto root = new ObjectDataViewModelNode(name, extruder_str);
-    // Add error icon if detected auto-repaire
-    if (has_errors)
-        root->m_bmp = m_warning_bmp;
+    // Add warning icon if detected auto-repaire
+    root->SetWarningBitmap(GetWarningBitmap(warning_icon_name), warning_icon_name);
 
     m_objects.push_back(root);
 	// notify control
@@ -351,7 +366,7 @@ wxDataViewItem ObjectDataViewModel::Add(const wxString &name,
 wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent_item,
                                                     const wxString &name,
                                                     const Slic3r::ModelVolumeType volume_type,
-                                                    const bool has_errors/* = false*/,
+                                                    const std::string& warning_icon_name/* = std::string()*/,
                                                     const int extruder/* = 0*/,
                                                     const bool create_frst_child/* = true*/)
 {
@@ -365,12 +380,10 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
     if (insert_position < 0)
         insert_position = get_root_idx(root, itInstanceRoot);
 
-    const bool obj_errors = root->m_bmp.IsOk();
-
     if (create_frst_child && root->m_volumes_cnt == 0)
     {
         const Slic3r::ModelVolumeType type = Slic3r::ModelVolumeType::MODEL_PART;
-        const auto node = new ObjectDataViewModelNode(root, root->m_name, type, GetVolumeIcon(type, obj_errors), extruder_str, 0);
+        const auto node = new ObjectDataViewModelNode(root, root->m_name, type, GetVolumeIcon(type, root->m_warning_icon_name), extruder_str, 0, root->m_warning_icon_name);
 
         insert_position < 0 ? root->Append(node) : root->Insert(node, insert_position);
 		// notify control
@@ -381,12 +394,13 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
         if (insert_position >= 0) insert_position++;
 	}
 
-    const auto node = new ObjectDataViewModelNode(root, name, volume_type, GetVolumeIcon(volume_type, has_errors), extruder_str, root->m_volumes_cnt);
+    const auto node = new ObjectDataViewModelNode(root, name, volume_type, GetVolumeIcon(volume_type, warning_icon_name), extruder_str, root->m_volumes_cnt, warning_icon_name);
     insert_position < 0 ? root->Append(node) : root->Insert(node, insert_position);
 
     // if part with errors is added, but object wasn't marked, then mark it
-    if (!obj_errors && has_errors)
-        root->SetBitmap(m_warning_bmp);
+    if (!warning_icon_name.empty() && warning_icon_name != root->m_warning_icon_name && 
+        (root->m_warning_icon_name.empty() || root->m_warning_icon_name == WarningManifoldIcon) )
+        root->SetWarningBitmap(GetWarningBitmap(warning_icon_name), warning_icon_name);
 
 	// notify control
     const wxDataViewItem child((void*)node);
@@ -1666,6 +1680,7 @@ void ObjectDataViewModel::Rescale()
 {
     m_volume_bmps = MenuFactory::get_volume_bitmaps();
     m_warning_bmp = create_scaled_bitmap(WarningIcon);
+    m_warning_manifold_bmp = create_scaled_bitmap(WarningManifoldIcon);
 
     wxDataViewItemArray all_items;
     GetAllChildren(wxDataViewItem(0), all_items);
@@ -1681,10 +1696,10 @@ void ObjectDataViewModel::Rescale()
         switch (node->m_type)
         {
         case itObject:
-            if (node->m_bmp.IsOk()) node->m_bmp = m_warning_bmp;
+            if (node->m_bmp.IsOk()) node->m_bmp = GetWarningBitmap(node->m_warning_icon_name);
             break;
         case itVolume:
-            node->m_bmp = GetVolumeIcon(node->m_volume_type, node->m_bmp.GetWidth() != node->m_bmp.GetHeight());
+            node->m_bmp = GetVolumeIcon(node->m_volume_type, node->m_warning_icon_name);
             break;
         case itLayerRoot:
             node->m_bmp = create_scaled_bitmap(LayerRootIcon);
@@ -1698,19 +1713,19 @@ void ObjectDataViewModel::Rescale()
     }
 }
 
-wxBitmap ObjectDataViewModel::GetVolumeIcon(const Slic3r::ModelVolumeType vol_type, const bool is_marked/* = false*/)
+wxBitmap ObjectDataViewModel::GetVolumeIcon(const Slic3r::ModelVolumeType vol_type, const std::string& warning_icon_name/* = std::string()*/)
 {
-    if (!is_marked)
+    if (warning_icon_name.empty())
         return m_volume_bmps[static_cast<int>(vol_type)];
 
-    std::string scaled_bitmap_name = "warning" + std::to_string(static_cast<int>(vol_type));
-    scaled_bitmap_name += "-em" + std::to_string(Slic3r::GUI::wxGetApp().em_unit());
+    std::string scaled_bitmap_name = warning_icon_name + std::to_string(static_cast<int>(vol_type));
+    scaled_bitmap_name += "-em" + std::to_string(wxGetApp().em_unit()) + (wxGetApp().dark_mode() ? "-dm" : "-lm");
 
     wxBitmap *bmp = m_bitmap_cache->find(scaled_bitmap_name);
     if (bmp == nullptr) {
         std::vector<wxBitmap> bmps;
 
-        bmps.emplace_back(m_warning_bmp);
+        bmps.emplace_back(GetWarningBitmap(warning_icon_name));
         bmps.emplace_back(m_volume_bmps[static_cast<int>(vol_type)]);
 
         bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps);
@@ -1719,20 +1734,20 @@ wxBitmap ObjectDataViewModel::GetVolumeIcon(const Slic3r::ModelVolumeType vol_ty
     return *bmp;
 }
 
-void ObjectDataViewModel::AddWarningIcon(const wxDataViewItem& item)
+void ObjectDataViewModel::AddWarningIcon(const wxDataViewItem& item, const std::string& warning_icon_name)
 {
     if (!item.IsOk())
         return;
     ObjectDataViewModelNode *node = static_cast<ObjectDataViewModelNode*>(item.GetID());
 
     if (node->GetType() & itObject) {
-        node->SetBitmap(m_warning_bmp);
+        node->SetWarningBitmap(GetWarningBitmap(warning_icon_name), warning_icon_name);
         return;
     }
 
     if (node->GetType() & itVolume) {
-        node->SetBitmap(GetVolumeIcon(node->GetVolumeType(), true));
-        node->GetParent()->SetBitmap(m_warning_bmp);
+        node->SetWarningBitmap(GetVolumeIcon(node->GetVolumeType(), warning_icon_name), warning_icon_name);
+        node->GetParent()->SetWarningBitmap(GetWarningBitmap(warning_icon_name), warning_icon_name);
         return;
     }
 }
@@ -1748,11 +1763,11 @@ void ObjectDataViewModel::DeleteWarningIcon(const wxDataViewItem& item, const bo
         return;
 
     if (node->GetType() & itVolume) {
-        node->SetBitmap(m_volume_bmps[static_cast<int>(node->volume_type())]);
+        node->SetWarningBitmap(m_volume_bmps[static_cast<int>(node->volume_type())], "");
         return;
     }
 
-    node->SetBitmap(wxNullBitmap);
+    node->SetWarningBitmap(wxNullBitmap, "");
     if (unmark_object)
     {
         wxDataViewItemArray children;
@@ -1762,6 +1777,23 @@ void ObjectDataViewModel::DeleteWarningIcon(const wxDataViewItem& item, const bo
     }
 }
 
+bool ObjectDataViewModel::HasWarningIcon(const wxDataViewItem& item) const
+{
+    if (!item.IsOk())
+        return false;
+
+    ObjectDataViewModelNode *node = static_cast<ObjectDataViewModelNode*>(item.GetID());
+    return node->has_warning_icon();
+}
+
+void ObjectDataViewModel::UpdateWarningIcon(const wxDataViewItem& item, const std::string& warning_icon_name)
+{
+    if (warning_icon_name.empty())
+        DeleteWarningIcon(item, true);
+    else
+        AddWarningIcon(item, warning_icon_name);
+}
+
 } // namespace GUI
 } // namespace Slic3r
 
diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp
index f65f829f4..f8885b206 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.hpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.hpp
@@ -78,6 +78,7 @@ class ObjectDataViewModelNode
     wxBitmap				        m_action_icon;
     PrintIndicator                  m_printable {piUndef};
     wxBitmap				        m_printable_icon;
+    std::string                     m_warning_icon_name{ "" };
 
     std::string                     m_action_icon_name = "";
     ModelVolumeType                 m_volume_type;
@@ -100,7 +101,8 @@ public:
                             Slic3r::ModelVolumeType type,
                             const wxBitmap& bmp,
                             const wxString& extruder,
-                            const int idx = -1);
+                            const int idx = -1,
+                            const std::string& warning_icon_name = std::string());
 
     ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
                             const t_layer_height_range& layer_range,
@@ -179,6 +181,7 @@ public:
     void            SetVolumeType(ModelVolumeType type) { m_volume_type = type; }
     void            SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
     void            SetExtruder(const wxString &extruder) { m_extruder = extruder; }
+    void            SetWarningBitmap(const wxBitmap& icon, const std::string& warning_icon_name) { m_bmp = icon; m_warning_icon_name = warning_icon_name; }
     const wxBitmap& GetBitmap() const               { return m_bmp; }
     const wxString& GetName() const                 { return m_name; }
     ItemType        GetType() const                 { return m_type; }
@@ -225,6 +228,8 @@ public:
     void        set_extruder_icon();
 	// Set printable icon for node
     void        set_printable_icon(PrintIndicator printable);
+    // Set warning icon for node
+    void        set_warning_icon(const std::string& warning_icon);
 
     void        update_settings_digest_bitmaps();
     bool        update_settings_digest(const std::vector<std::string>& categories);
@@ -235,6 +240,7 @@ public:
     bool 		valid();
 #endif /* NDEBUG */
     bool        invalid() const { return m_idx < -1; }
+    bool        has_warning_icon() const { return !m_warning_icon_name.empty(); }
 
 private:
     friend class ObjectDataViewModel;
@@ -253,7 +259,9 @@ class ObjectDataViewModel :public wxDataViewModel
     std::vector<ObjectDataViewModelNode*>       m_objects;
     std::vector<wxBitmap>                       m_volume_bmps;
     std::map<InfoItemType, wxBitmap>            m_info_bmps;
+    wxBitmap                                    m_empty_bmp;
     wxBitmap                                    m_warning_bmp;
+    wxBitmap                                    m_warning_manifold_bmp;
 
     wxDataViewCtrl*                             m_ctrl { nullptr };
 
@@ -263,11 +271,11 @@ public:
 
     wxDataViewItem Add( const wxString &name,
                         const int extruder,
-                        const bool has_errors = false);
+                        const std::string& warning_icon_name = std::string());
     wxDataViewItem AddVolumeChild(  const wxDataViewItem &parent_item,
                                     const wxString &name,
                                     const Slic3r::ModelVolumeType volume_type,
-                                    const bool has_errors = false,
+                                    const std::string& warning_icon_name = std::string(),
                                     const int extruder = 0,
                                     const bool create_frst_child = true);
     wxDataViewItem AddSettingsChild(const wxDataViewItem &parent_item);
@@ -378,9 +386,11 @@ public:
     void    Rescale();
 
     wxBitmap    GetVolumeIcon(const Slic3r::ModelVolumeType vol_type,
-                              const bool is_marked = false);
-    void        AddWarningIcon(const wxDataViewItem& item);
+                              const std::string& warning_icon_name = std::string());
+    void        AddWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
     void        DeleteWarningIcon(const wxDataViewItem& item, const bool unmark_object = false);
+    void        UpdateWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
+    bool        HasWarningIcon(const wxDataViewItem& item) const;
     t_layer_height_range    GetLayerRangeByItem(const wxDataViewItem& item) const;
 
     bool        UpdateColumValues(unsigned col);
@@ -392,6 +402,8 @@ private:
     wxDataViewItem  AddRoot(const wxDataViewItem& parent_item, const ItemType root_type);
     wxDataViewItem  AddInstanceRoot(const wxDataViewItem& parent_item);
     void            AddAllChildren(const wxDataViewItem& parent);
+
+    wxBitmap&       GetWarningBitmap(const std::string& warning_icon_name);
 };
 
 
diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp
index 91f1f1f0b..3baa8a4da 100644
--- a/src/slic3r/GUI/OpenGLManager.cpp
+++ b/src/slic3r/GUI/OpenGLManager.cpp
@@ -27,7 +27,7 @@ namespace Slic3r {
 namespace GUI {
 
 // A safe wrapper around glGetString to report a "N/A" string in case glGetString returns nullptr.
-inline std::string gl_get_string_safe(GLenum param, const std::string& default_value)
+std::string gl_get_string_safe(GLenum param, const std::string& default_value)
 {
     const char* value = (const char*)::glGetString(param);
     return std::string((value != nullptr) ? value : default_value);
diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp
index ca9452db6..716256e40 100644
--- a/src/slic3r/GUI/OpenGLManager.hpp
+++ b/src/slic3r/GUI/OpenGLManager.hpp
@@ -10,6 +10,7 @@ class wxGLContext;
 namespace Slic3r {
 namespace GUI {
 
+
 class OpenGLManager
 {
 public:
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
index 519abab43..22ced12e4 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -532,9 +532,9 @@ void PhysicalPrinterDialog::update_host_type(bool printer_change)
                 const std::vector<VendorProfile::PrinterModel>& models = preset->vendor->models;
                 auto it = std::find_if(models.begin(), models.end(),
                     [model_id](const VendorProfile::PrinterModel& model) { return model.id == model_id; });
-                if (it != models.end() && it->family == "MK3")
+                if (it != models.end() && (it->family == "MK3" || it->family == "MINI"))
                     continue;
-            } else if (!preset->vendor && model_id.rfind("MK3", 0) == 0) {
+            } else if (!preset->vendor && (boost::ends_with(model_id, "MK3") || boost::ends_with(model_id, "MINI"))) {
                 continue;
             }
             
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 7d344c389..68c20d497 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -27,6 +27,11 @@
 #include <wx/numdlg.h>
 #include <wx/debug.h>
 #include <wx/busyinfo.h>
+#ifdef _WIN32
+#include <wx/richtooltip.h>
+#include <wx/custombgwin.h>
+#include <wx/popupwin.h>
+#endif
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Format/STL.hpp"
@@ -67,8 +72,8 @@
 #include "Jobs/FillBedJob.hpp"
 #include "Jobs/RotoptimizeJob.hpp"
 #include "Jobs/SLAImportJob.hpp"
+#include "Jobs/NotificationProgressIndicator.hpp"
 #include "BackgroundSlicingProcess.hpp"
-#include "ProgressStatusBar.hpp"
 #include "PrintHostDialogs.hpp"
 #include "ConfigWizard.hpp"
 #include "../Utils/ASCIIFolding.hpp"
@@ -125,6 +130,7 @@ wxDEFINE_EVENT(EVT_EXPORT_BEGAN,                    wxCommandEvent);
 
 class ObjectInfo : public wxStaticBoxSizer
 {
+    std::string m_warning_icon_name{ "exclamation" };
 public:
     ObjectInfo(wxWindow *parent);
 
@@ -142,6 +148,7 @@ public:
     bool        showing_manifold_warning_icon;
     void        show_sizer(bool show);
     void        msw_rescale();
+    void        update_warning_icon(const std::string& warning_icon_name);
 };
 
 ObjectInfo::ObjectInfo(wxWindow *parent) :
@@ -171,13 +178,10 @@ ObjectInfo::ObjectInfo(wxWindow *parent) :
     label_materials = init_info_label(&info_materials, _L("Materials"));
     Add(grid_sizer, 0, wxEXPAND);
 
-    auto *info_manifold_text = new wxStaticText(parent, wxID_ANY, _L("Manifold") + ":");
-    info_manifold_text->SetFont(wxGetApp().small_font());
     info_manifold = new wxStaticText(parent, wxID_ANY, "");
     info_manifold->SetFont(wxGetApp().small_font());
-    manifold_warning_icon = new wxStaticBitmap(parent, wxID_ANY, create_scaled_bitmap("exclamation"));
+    manifold_warning_icon = new wxStaticBitmap(parent, wxID_ANY, create_scaled_bitmap(m_warning_icon_name));
     auto *sizer_manifold = new wxBoxSizer(wxHORIZONTAL);
-    sizer_manifold->Add(info_manifold_text, 0);
     sizer_manifold->Add(manifold_warning_icon, 0, wxLEFT, 2);
     sizer_manifold->Add(info_manifold, 0, wxLEFT, 2);
     Add(sizer_manifold, 0, wxEXPAND | wxTOP, 4);
@@ -194,7 +198,15 @@ void ObjectInfo::show_sizer(bool show)
 
 void ObjectInfo::msw_rescale()
 {
-    manifold_warning_icon->SetBitmap(create_scaled_bitmap("exclamation"));
+    manifold_warning_icon->SetBitmap(create_scaled_bitmap(m_warning_icon_name));
+}
+
+void ObjectInfo::update_warning_icon(const std::string& warning_icon_name)
+{
+    if (showing_manifold_warning_icon = !warning_icon_name.empty()) {
+        m_warning_icon_name = warning_icon_name;
+        manifold_warning_icon->SetBitmap(create_scaled_bitmap(m_warning_icon_name));
+    }
 }
 
 enum SlicedInfoIdx
@@ -612,6 +624,12 @@ struct Sidebar::priv
     ~priv();
 
     void show_preset_comboboxes();
+
+#ifdef _WIN32
+    wxString btn_reslice_tip;
+    void show_rich_tip(const wxString& tooltip, wxButton* btn);
+    void hide_rich_tip(wxButton* btn);
+#endif
 };
 
 Sidebar::priv::~priv()
@@ -640,6 +658,29 @@ void Sidebar::priv::show_preset_comboboxes()
     scrolled->Refresh();
 }
 
+#ifdef _WIN32
+void Sidebar::priv::show_rich_tip(const wxString& tooltip, wxButton* btn)
+{   
+    if (tooltip.IsEmpty())
+        return;
+    wxRichToolTip tip(tooltip, "");
+    tip.SetIcon(wxICON_NONE);
+    tip.SetTipKind(wxTipKind_BottomRight);
+    tip.SetTitleFont(wxGetApp().normal_font());
+    tip.SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    tip.ShowFor(btn);
+}
+
+void Sidebar::priv::hide_rich_tip(wxButton* btn)
+{
+    auto children = btn->GetChildren();
+    using wxRichToolTipPopup = wxCustomBackgroundWindow<wxPopupTransientWindow>;
+    for (auto child : children) {
+        if (wxRichToolTipPopup* popup = dynamic_cast<wxRichToolTipPopup*>(child))
+            popup->Dismiss();
+    }
+}
+#endif
 
 // Sidebar / public
 
@@ -774,7 +815,19 @@ Sidebar::Sidebar(Plater *parent)
 #endif //__APPLE__
         ScalableBitmap bmp = ScalableBitmap(this, icon_name, bmp_px_cnt);
         *btn = new ScalableButton(this, wxID_ANY, bmp, "", wxBU_EXACTFIT);
+
+#ifdef _WIN32
+        (*btn)->Bind(wxEVT_ENTER_WINDOW, [tooltip, btn, this](wxMouseEvent& event) {
+            p->show_rich_tip(tooltip, *btn);
+            event.Skip();
+        });
+        (*btn)->Bind(wxEVT_LEAVE_WINDOW, [btn, this](wxMouseEvent& event) {
+            p->hide_rich_tip(*btn);
+            event.Skip();
+        });
+#else
         (*btn)->SetToolTip(tooltip);
+#endif // _WIN32
         (*btn)->Hide();
     };
 
@@ -833,6 +886,18 @@ Sidebar::Sidebar(Plater *parent)
             p->plater->reslice();
         p->plater->select_view_3D("Preview");
     });
+
+#ifdef _WIN32
+    p->btn_reslice->Bind(wxEVT_ENTER_WINDOW, [this](wxMouseEvent& event) {
+        p->show_rich_tip(p->btn_reslice_tip, p->btn_reslice);
+        event.Skip();
+    });
+    p->btn_reslice->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent& event) {
+        p->hide_rich_tip(p->btn_reslice);
+        event.Skip();
+    });
+#endif // _WIN32
+
     p->btn_send_gcode->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { p->plater->send_gcode(); });
 //    p->btn_eject_device->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { p->plater->eject_drive(); });
 	p->btn_export_gcode_removable->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { p->plater->export_gcode(true); });
@@ -960,7 +1025,11 @@ void Sidebar::update_reslice_btn_tooltip() const
     wxString tooltip = wxString("Slice") + " [" + GUI::shortkey_ctrl_prefix() + "R]";
     if (m_mode != comSimple)
         tooltip += wxString("\n") + _L("Hold Shift to Slice & Export G-code");
+#ifdef _WIN32
+    p->btn_reslice_tip = tooltip;
+#else
     p->btn_reslice->SetToolTip(tooltip);
+#endif
 }
 
 void Sidebar::msw_rescale()
@@ -1129,42 +1198,18 @@ void Sidebar::show_info_sizer()
     p->object_info->info_size->SetLabel(wxString::Format("%.2f x %.2f x %.2f",size(0)*koef, size(1)*koef, size(2)*koef));
     p->object_info->info_materials->SetLabel(wxString::Format("%d", static_cast<int>(model_object->materials_count())));
 
-    const auto& stats = model_object->get_object_stl_stats();//model_object->volumes.front()->mesh.stl.stats;
+    const auto& stats = model_object->get_object_stl_stats();
     p->object_info->info_volume->SetLabel(wxString::Format("%.2f", stats.volume*pow(koef,3)));
     p->object_info->info_facets->SetLabel(format_wxstr(_L_PLURAL("%1% (%2$d shell)", "%1% (%2$d shells)", stats.number_of_parts),
                                                        static_cast<int>(model_object->facets_count()), stats.number_of_parts));
 
-    int errors = stats.degenerate_facets + stats.edges_fixed + stats.facets_removed +
-        stats.facets_added + stats.facets_reversed + stats.backwards_edges;
-    if (errors > 0) {
-        wxString tooltip = format_wxstr(_L_PLURAL("Auto-repaired %1$d error", "Auto-repaired %1$d errors", errors), errors);
-        p->object_info->info_manifold->SetLabel(tooltip);
-
-        tooltip += ":\n";
-        if (stats.degenerate_facets > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d degenerate facet", "%1$d degenerate facets", stats.degenerate_facets), stats.degenerate_facets) + ", ";
-        if (stats.edges_fixed > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d edge fixed", "%1$d edges fixed", stats.edges_fixed), stats.edges_fixed) + ", ";
-        if (stats.facets_removed > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d facet removed", "%1$d facets removed", stats.facets_removed), stats.facets_removed) + ", ";
-        if (stats.facets_added > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d facet added", "%1$d facets added", stats.facets_added), stats.facets_added) + ", ";
-        if (stats.facets_reversed > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d facet reversed", "%1$d facets reversed", stats.facets_reversed), stats.facets_reversed) + ", ";
-        if (stats.backwards_edges > 0)
-            tooltip += format_wxstr(_L_PLURAL("%1$d backwards edge", "%1$d backwards edges", stats.backwards_edges), stats.backwards_edges) + ", ";
-        tooltip.RemoveLast(2);//remove last coma
-
-        p->object_info->showing_manifold_warning_icon = true;
-        p->object_info->info_manifold->SetToolTip(tooltip);
-        p->object_info->manifold_warning_icon->SetToolTip(tooltip);
-    }
-    else {
-        p->object_info->info_manifold->SetLabel(_L("Yes"));
-        p->object_info->showing_manifold_warning_icon = false;
-        p->object_info->info_manifold->SetToolTip("");
-        p->object_info->manifold_warning_icon->SetToolTip("");
-    }
+    wxString info_manifold_label;
+    auto mesh_errors = obj_list()->get_mesh_errors_info(&info_manifold_label);
+    wxString tooltip = mesh_errors.tooltip;
+    p->object_info->update_warning_icon(mesh_errors.warning_icon_name);
+    p->object_info->info_manifold->SetLabel(info_manifold_label);
+    p->object_info->info_manifold->SetToolTip(tooltip);
+    p->object_info->manifold_warning_icon->SetToolTip(tooltip);
 
     p->object_info->show_sizer(true);
 
@@ -1501,7 +1546,7 @@ struct Plater::priv
     GLToolbar view_toolbar;
     GLToolbar collapse_toolbar;
     Preview *preview;
-    std::shared_ptr<NotificationManager> notification_manager;
+    std::unique_ptr<NotificationManager> notification_manager;
 
     ProjectDirtyStateManager dirty_state;
 
@@ -1516,39 +1561,42 @@ struct Plater::priv
     {
         priv *m;
         size_t m_arrange_id, m_fill_bed_id, m_rotoptimize_id, m_sla_import_id;
+        std::shared_ptr<NotificationProgressIndicator> m_pri;
         
         void before_start() override { m->background_process.stop(); }
         
     public:
-        Jobs(priv *_m) : m(_m)
+        Jobs(priv *_m) :
+            m(_m),
+            m_pri{std::make_shared<NotificationProgressIndicator>(m->notification_manager.get())}
         {
-            m_arrange_id = add_job(std::make_unique<ArrangeJob>(m->notification_manager, m->q));
-            m_fill_bed_id = add_job(std::make_unique<FillBedJob>(m->notification_manager, m->q));
-            m_rotoptimize_id = add_job(std::make_unique<RotoptimizeJob>(m->notification_manager, m->q));
-            m_sla_import_id = add_job(std::make_unique<SLAImportJob>(m->notification_manager, m->q));
+            m_arrange_id = add_job(std::make_unique<ArrangeJob>(m_pri, m->q));
+            m_fill_bed_id = add_job(std::make_unique<FillBedJob>(m_pri, m->q));
+            m_rotoptimize_id = add_job(std::make_unique<RotoptimizeJob>(m_pri, m->q));
+            m_sla_import_id = add_job(std::make_unique<SLAImportJob>(m_pri, m->q));
         }
         
         void arrange()
         {
-            m->take_snapshot(_(L("Arrange")));
+            m->take_snapshot(_L("Arrange"));
             start(m_arrange_id);
         }
 
         void fill_bed()
         {
-            m->take_snapshot(_(L("Fill bed")));
+            m->take_snapshot(_L("Fill bed"));
             start(m_fill_bed_id);
         }
         
         void optimize_rotation()
         {
-            m->take_snapshot(_(L("Optimize Rotation")));
+            m->take_snapshot(_L("Optimize Rotation"));
             start(m_rotoptimize_id);
         }
         
         void import_sla_arch()
         {
-            m->take_snapshot(_(L("Import SLA archive")));
+            m->take_snapshot(_L("Import SLA archive"));
             start(m_sla_import_id);
         }
         
@@ -1575,21 +1623,27 @@ struct Plater::priv
 
     bool is_project_dirty() const { return dirty_state.is_dirty(); }
     void update_project_dirty_from_presets() { dirty_state.update_from_presets(); }
-    int save_project_if_dirty() {
+    int save_project_if_dirty(const wxString& reason) {
         int res = wxID_NO;
         if (dirty_state.is_dirty()) {
             MainFrame* mainframe = wxGetApp().mainframe;
             if (mainframe->can_save_as()) {
-                //wxMessageDialog dlg(mainframe, _L("Do you want to save the changes to the current project ?"), wxString(SLIC3R_APP_NAME), wxYES_NO | wxCANCEL);
-                MessageDialog dlg(mainframe, _L("Do you want to save the changes to the current project ?"), wxString(SLIC3R_APP_NAME), wxYES_NO | wxCANCEL);
-                res = dlg.ShowModal();
+                wxString suggested_project_name;
+                wxString project_name = suggested_project_name = get_project_filename(".3mf");
+                if (suggested_project_name.IsEmpty()) {
+                    fs::path output_file = get_export_file_path(FT_3MF);
+                    suggested_project_name = output_file.empty() ? _L("Untitled") : from_u8(output_file.stem().string());
+                }
+                res = MessageDialog(mainframe, reason + "\n" + format_wxstr(_L("Do you want to save the changes to \"%1%\"?"), suggested_project_name), 
+                                    wxString(SLIC3R_APP_NAME), wxYES_NO | wxCANCEL).ShowModal();
                 if (res == wxID_YES)
-                    mainframe->save_project_as(wxGetApp().plater()->get_project_filename());
+                    if (!mainframe->save_project_as(project_name))
+                        res = wxID_CANCEL;
             }
         }
         return res;
     }
-    void reset_project_dirty_after_save() { dirty_state.reset_after_save(); }
+    void reset_project_dirty_after_save() { m_undo_redo_stack_main.mark_current_as_saved(); dirty_state.reset_after_save(); }
     void reset_project_dirty_initial_presets() { dirty_state.reset_initial_presets(); }
 
 #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
@@ -1644,6 +1698,7 @@ struct Plater::priv
     std::vector<size_t> load_files(const std::vector<fs::path>& input_files, bool load_model, bool load_config, bool used_inches = false);
     std::vector<size_t> load_model_objects(const ModelObjectPtrs& model_objects, bool allow_negative_z = false);
 
+    fs::path get_export_file_path(GUI::FileType file_type);
     wxString get_export_file(GUI::FileType file_type);
 
     const Selection& get_selection() const;
@@ -1670,8 +1725,9 @@ struct Plater::priv
     void enter_gizmos_stack();
     void leave_gizmos_stack();
 
-    void take_snapshot(const std::string& snapshot_name);
-    void take_snapshot(const wxString& snapshot_name) { this->take_snapshot(std::string(snapshot_name.ToUTF8().data())); }
+    void take_snapshot(const std::string& snapshot_name, UndoRedo::SnapshotType snapshot_type = UndoRedo::SnapshotType::Action);
+    void take_snapshot(const wxString& snapshot_name, UndoRedo::SnapshotType snapshot_type = UndoRedo::SnapshotType::Action)
+        { this->take_snapshot(std::string(snapshot_name.ToUTF8().data()), snapshot_type); }
     int  get_active_snapshot_index();
 
     void undo();
@@ -1717,9 +1773,11 @@ struct Plater::priv
 	}
     void export_gcode(fs::path output_path, bool output_path_on_removable_media, PrintHostJob upload_job);
     void reload_from_disk();
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+    bool replace_volume_with_stl(int object_idx, int volume_idx, const fs::path& new_path, const wxString& snapshot = "");
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
     void replace_with_stl();
     void reload_all_from_disk();
-    void fix_through_netfabb(const int obj_idx, const int vol_idx = -1);
     void create_simplify_notification(const std::vector<size_t>& obj_ids);
     void set_current_panel(wxPanel* panel);
 
@@ -1847,7 +1905,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         "support_material_contact_distance", "support_material_bottom_contact_distance", "raft_layers"
         }))
     , sidebar(new Sidebar(q))
-    , notification_manager(std::make_shared<NotificationManager>(q))
+    , notification_manager(std::make_unique<NotificationManager>(q))
     , m_ui_jobs(this)
     , delayed_scene_refresh(false)
     , view_toolbar(GLToolbar::Radio, "View")
@@ -1911,6 +1969,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         sidebar->Bind(wxEVT_COMBOBOX, &priv::on_select_preset, this);
         sidebar->Bind(EVT_OBJ_LIST_OBJECT_SELECT, [this](wxEvent&) { priv::selection_changed(); });
         sidebar->Bind(EVT_SCHEDULE_BACKGROUND_PROCESS, [this](SimpleEvent&) { this->schedule_background_process(); });
+        // jump to found option from SearchDialog
+        q->Bind(wxCUSTOMEVT_JUMP_TO_OPTION, [this](wxCommandEvent& evt) { sidebar->jump_to_option(evt.GetInt()); });
     }
 
     wxGLCanvas* view3D_canvas = view3D->get_wxglcanvas();
@@ -2051,7 +2111,10 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     }
 
     // Initialize the Undo / Redo stack with a first snapshot.
-    this->take_snapshot(_L("New Project"));
+    this->take_snapshot(_L("New Project"), UndoRedo::SnapshotType::ProjectSeparator);
+    // Reset the "dirty project" flag.
+    m_undo_redo_stack_main.mark_current_as_saved();
+    dirty_state.update_from_undo_redo_stack(false);
 
     this->q->Bind(EVT_LOAD_MODEL_OTHER_INSTANCE, [this](LoadFromOtherInstanceEvent& evt) {
         BOOST_LOG_TRIVIAL(trace) << "Received load from other instance event.";
@@ -2094,13 +2157,14 @@ void Plater::priv::update(unsigned int flags)
     }
 
     unsigned int update_status = 0;
-    if (this->printer_technology == ptSLA || (flags & (unsigned int)UpdateParams::FORCE_BACKGROUND_PROCESSING_UPDATE))
+    const bool force_background_processing_restart = this->printer_technology == ptSLA || (flags & (unsigned int)UpdateParams::FORCE_BACKGROUND_PROCESSING_UPDATE);
+    if (force_background_processing_restart)
         // Update the SLAPrint from the current Model, so that the reload_scene()
         // pulls the correct data.
         update_status = this->update_background_process(false, flags & (unsigned int)UpdateParams::POSTPONE_VALIDATION_ERROR_MESSAGE);
     this->view3D->reload_scene(false, flags & (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH);
     this->preview->reload_print();
-    if (this->printer_technology == ptSLA)
+    if (force_background_processing_restart)
         this->restart_background_process(update_status);
     else
         this->schedule_background_process();
@@ -2331,7 +2395,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
                                 for (std::string& name : names)
                                     notif_text += "\n - " + name;
                                 notification_manager->push_notification(NotificationType::CustomNotification,
-                                    NotificationManager::NotificationLevel::RegularNotificationLevel, notif_text);
+                                    NotificationManager::NotificationLevel::PrintInfoNotificationLevel, notif_text);
                             }
                         }
 
@@ -2542,16 +2606,14 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs& mode
             if (max_ratio > 10000) {
                 // the size of the object is too big -> this could lead to overflow when moving to clipper coordinates,
                 // so scale down the mesh
-                double inv = 1. / max_ratio;
-                object->scale_mesh_after_creation(inv * Vec3d::Ones());
+                object->scale_mesh_after_creation(1. / max_ratio);
                 object->origin_translation = Vec3d::Zero();
                 object->center_around_origin();
                 scaled_down = true;
                 break;
             }
             else if (max_ratio > 5) {
-                const Vec3d inverse = 1.0 / max_ratio * Vec3d::Ones();
-                instance->set_scaling_factor(inverse.cwiseProduct(instance->get_scaling_factor()));
+                instance->set_scaling_factor(instance->get_scaling_factor() / max_ratio);
                 scaled_down = true;
             }
         }
@@ -2587,6 +2649,7 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs& mode
     // so 3D-scene should be updated before object additing to the ObjectList
     this->view3D->reload_scene(false, (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH);
 
+    notification_manager->close_notification_of_type(NotificationType::UpdatedItemsInfo);
     for (const size_t idx : obj_idxs) {
         wxGetApp().obj_list()->add_object_to_list(idx);
     }
@@ -2599,22 +2662,8 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs& mode
     return obj_idxs;
 }
 
-wxString Plater::priv::get_export_file(GUI::FileType file_type)
+fs::path Plater::priv::get_export_file_path(GUI::FileType file_type)
 {
-    wxString wildcard;
-    switch (file_type) {
-        case FT_STL:
-        case FT_AMF:
-        case FT_3MF:
-        case FT_GCODE:
-        case FT_OBJ:
-            wildcard = file_wildcards(file_type);
-        break;
-        default:
-            wildcard = file_wildcards(FT_MODEL);
-        break;
-    }
-
     // Update printbility state of each of the ModelInstances.
     this->update_print_volume_state();
 
@@ -2639,7 +2688,31 @@ wxString Plater::priv::get_export_file(GUI::FileType file_type)
         if (output_file.empty() && !model.objects.empty())
             // Find the file name of the first object.
             output_file = this->model.objects[0]->get_export_filename();
+
+        if (output_file.empty())
+            // Use _L("Untitled") name
+            output_file = into_path(_L("Untitled"));
     }
+    return output_file;
+}
+
+wxString Plater::priv::get_export_file(GUI::FileType file_type)
+{
+    wxString wildcard;
+    switch (file_type) {
+        case FT_STL:
+        case FT_AMF:
+        case FT_3MF:
+        case FT_GCODE:
+        case FT_OBJ:
+            wildcard = file_wildcards(file_type);
+        break;
+        default:
+            wildcard = file_wildcards(FT_MODEL);
+        break;
+    }
+
+    fs::path output_file = get_export_file_path(file_type);
 
     wxString dlg_title;
     switch (file_type) {
@@ -2799,7 +2872,7 @@ void Plater::priv::delete_all_objects_from_model()
 
 void Plater::priv::reset()
 {
-    Plater::TakeSnapshot snapshot(q, _L("Reset Project"));
+    Plater::TakeSnapshot snapshot(q, _L("Reset Project"), UndoRedo::SnapshotType::ProjectSeparator);
 
 	clear_warnings();
 
@@ -2886,7 +2959,7 @@ void Plater::priv::split_object()
         // If we splited object which is contain some parts/modifiers then all non-solid parts (modifiers) were deleted
         if (current_model_object->volumes.size() > 1 && current_model_object->volumes.size() != new_objects.size())
             notification_manager->push_notification(NotificationType::CustomNotification,
-                NotificationManager::NotificationLevel::RegularNotificationLevel,
+                NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                 _u8L("All non-solid parts (modifiers) were deleted"));
 
         Plater::TakeSnapshot snapshot(q, _L("Split to Objects"));
@@ -3055,12 +3128,14 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
     }
 
 	//actualizate warnings
-	if (invalidated != Print::APPLY_STATUS_UNCHANGED) {
+	if (invalidated != Print::APPLY_STATUS_UNCHANGED || background_process.empty()) {
+        if (background_process.empty())
+            process_validation_warning(std::string());
 		actualize_slicing_warnings(*this->background_process.current_print());
         actualize_object_warnings(*this->background_process.current_print());
 		show_warning_dialog = false;
-		process_completed_with_error = false;
-	}
+		process_completed_with_error = false;  
+	} 
 
     if (invalidated != Print::APPLY_STATUS_UNCHANGED && was_running && ! this->background_process.running() &&
         (return_state & UPDATE_BACKGROUND_PROCESS_RESTART) == 0) {
@@ -3085,6 +3160,9 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
 //        if ((return_state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 ||
 //            (return_state & UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE) != 0 )
 //            this->statusbar()->set_status_text(_L("Ready to slice"));
+        if ((return_state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 ||
+            (return_state & UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE) != 0 )
+            notification_manager->set_slicing_progress_hidden();
 
         sidebar->set_btn_label(ActionButtonType::abExport, _(label_btn_export));
         sidebar->set_btn_label(ActionButtonType::abSendGCode, _(label_btn_send));
@@ -3194,6 +3272,76 @@ void Plater::priv::update_sla_scene()
     this->update_restart_background_process(true, true);
 }
 
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+bool Plater::priv::replace_volume_with_stl(int object_idx, int volume_idx, const fs::path& new_path, const wxString& snapshot)
+{
+    const std::string path = new_path.string();
+    wxBusyCursor wait;
+    wxBusyInfo info(_L("Replace from:") + " " + from_u8(path), q->get_current_canvas3D()->get_wxglcanvas());
+
+    Model new_model;
+    try {
+        new_model = Model::read_from_file(path, nullptr, nullptr, Model::LoadAttribute::AddDefaultInstances);
+        for (ModelObject* model_object : new_model.objects) {
+            model_object->center_around_origin();
+            model_object->ensure_on_bed();
+        }
+    }
+    catch (std::exception&) {
+        // error while loading
+        return false;
+    }
+
+    if (new_model.objects.size() > 1 || new_model.objects.front()->volumes.size() > 1) {
+        MessageDialog dlg(q, _L("Unable to replace with more than one volume"), _L("Error during replace"), wxOK | wxOK_DEFAULT | wxICON_WARNING);
+        dlg.ShowModal();
+        return false;
+    }
+
+    if (!snapshot.empty())
+        q->take_snapshot(snapshot);
+
+    ModelObject* old_model_object = model.objects[object_idx];
+    ModelVolume* old_volume = old_model_object->volumes[volume_idx];
+
+    bool sinking = old_model_object->bounding_box().min.z() < SINKING_Z_THRESHOLD;
+
+    ModelObject* new_model_object = new_model.objects.front();
+    old_model_object->add_volume(*new_model_object->volumes.front());
+    ModelVolume* new_volume = old_model_object->volumes.back();
+    new_volume->set_new_unique_id();
+    new_volume->config.apply(old_volume->config);
+    new_volume->set_type(old_volume->type());
+    new_volume->set_material_id(old_volume->material_id());
+    new_volume->set_transformation(old_volume->get_transformation());
+    new_volume->translate(new_volume->get_transformation().get_matrix(true) * (new_volume->source.mesh_offset - old_volume->source.mesh_offset));
+    assert(!old_volume->source.is_converted_from_inches || !old_volume->source.is_converted_from_meters);
+    if (old_volume->source.is_converted_from_inches)
+        new_volume->convert_from_imperial_units();
+    else if (old_volume->source.is_converted_from_meters)
+        new_volume->convert_from_meters();
+    new_volume->supported_facets.assign(old_volume->supported_facets);
+    new_volume->seam_facets.assign(old_volume->seam_facets);
+    new_volume->mmu_segmentation_facets.assign(old_volume->mmu_segmentation_facets);
+    std::swap(old_model_object->volumes[volume_idx], old_model_object->volumes.back());
+    old_model_object->delete_volume(old_model_object->volumes.size() - 1);
+    if (!sinking)
+        old_model_object->ensure_on_bed();
+    old_model_object->sort_volumes(wxGetApp().app_config->get("order_volumes") == "1");
+
+    // if object has just one volume, rename object too
+    if (old_model_object->volumes.size() == 1)
+        old_model_object->name = old_model_object->volumes.front()->name;
+
+    // update new name in ObjectList
+    sidebar->obj_list()->update_name_in_list(object_idx, volume_idx);
+
+    sla::reproject_points_and_holes(old_model_object);
+
+    return true;
+}
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+
 void Plater::priv::replace_with_stl()
 {
     if (! q->canvas3D()->get_gizmos_manager().check_gizmos_closed_except(GLGizmosManager::EType::Undefined))
@@ -3230,8 +3378,10 @@ void Plater::priv::replace_with_stl()
         return;
     }
 
-    wxString fail_replace;
-
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+    if (!replace_volume_with_stl(object_idx, volume_idx, out_path, _L("Replace with STL")))
+        return;
+#else
     const auto& path = out_path.string();
     wxBusyCursor wait;
     wxBusyInfo info(_L("Replace from:") + " " + from_u8(path), q->get_current_canvas3D()->get_wxglcanvas());
@@ -3292,7 +3442,8 @@ void Plater::priv::replace_with_stl()
     // update new name in ObjectList
     sidebar->obj_list()->update_name_in_list(object_idx, volume_idx);
 
-    sla::reproject_points_and_holes(old_model_object);    
+    sla::reproject_points_and_holes(old_model_object);
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
 
     // update 3D scene
     update();
@@ -3341,6 +3492,9 @@ void Plater::priv::reload_from_disk()
     // collects paths of files to load
     std::vector<fs::path> input_paths;
     std::vector<fs::path> missing_input_paths;
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+    std::vector<fs::path> replace_paths;
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
     for (const SelectedVolume& v : selected_volumes) {
         const ModelObject* object = model.objects[v.object_idx];
         const ModelVolume* volume = object->volumes[v.volume_idx];
@@ -3348,8 +3502,28 @@ void Plater::priv::reload_from_disk()
         if (!volume->source.input_file.empty()) {
             if (fs::exists(volume->source.input_file))
                 input_paths.push_back(volume->source.input_file);
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+            else {
+                // searches the source in the same folder containing the object
+                bool found = false;
+                if (!object->input_file.empty()) {
+                    fs::path object_path = fs::path(object->input_file).remove_filename();
+                    if (!object_path.empty()) {
+                        object_path /= fs::path(volume->source.input_file).filename();
+                        const std::string source_input_file = object_path.string();
+                        if (fs::exists(source_input_file)) {
+                            input_paths.push_back(source_input_file);
+                            found = true;
+                        }
+                    }
+                }
+                if (!found)
+                    missing_input_paths.push_back(volume->source.input_file);
+            }
+#else
             else
                 missing_input_paths.push_back(volume->source.input_file);
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
         }
         else if (!object->input_file.empty() && volume->is_model_part() && !volume->name.empty() && !volume->source.is_from_builtin_objects)
             missing_input_paths.push_back(volume->name);
@@ -3392,17 +3566,32 @@ void Plater::priv::reload_from_disk()
             }
         }
         else {
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+            wxString message = _L("The selected file") + " (" + from_u8(sel_filename) + ") " +
+                _L("differs from the original file") + " (" + from_u8(search.filename().string()) + ").\n" + _L("Do you want to replace it") + " ?";
+            //wxMessageDialog dlg(q, message, wxMessageBoxCaptionStr, wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
+            MessageDialog dlg(q, message, wxMessageBoxCaptionStr, wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
+            if (dlg.ShowModal() == wxID_YES)
+                replace_paths.push_back(sel_filename_path);
+            missing_input_paths.pop_back();
+#else
             wxString message = _L("It is not allowed to change the file to reload") + " (" + from_u8(search.filename().string()) + ").\n" + _L("Do you want to retry") + " ?";
             //wxMessageDialog dlg(q, message, wxMessageBoxCaptionStr, wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
             MessageDialog dlg(q, message, wxMessageBoxCaptionStr, wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
             if (dlg.ShowModal() != wxID_YES)
                 return;
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
         }
     }
 
     std::sort(input_paths.begin(), input_paths.end());
     input_paths.erase(std::unique(input_paths.begin(), input_paths.end()), input_paths.end());
 
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+    std::sort(replace_paths.begin(), replace_paths.end());
+    replace_paths.erase(std::unique(replace_paths.begin(), replace_paths.end()), replace_paths.end());
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+
     std::vector<wxString> fail_list;
 
     // load one file at a time
@@ -3497,6 +3686,20 @@ void Plater::priv::reload_from_disk()
         }
     }
 
+#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+    for (size_t i = 0; i < replace_paths.size(); ++i) {
+        const auto& path = replace_paths[i].string();
+        for (const SelectedVolume& sel_v : selected_volumes) {
+            ModelObject* old_model_object = model.objects[sel_v.object_idx];
+            ModelVolume* old_volume = old_model_object->volumes[sel_v.volume_idx];
+            bool has_source = !old_volume->source.input_file.empty() && boost::algorithm::iequals(fs::path(old_volume->source.input_file).filename().string(), fs::path(path).filename().string());
+            if (!replace_volume_with_stl(sel_v.object_idx, sel_v.volume_idx, path, "")) {
+                fail_list.push_back(from_u8(has_source ? old_volume->source.input_file : old_volume->name));
+            }
+        }
+    }
+#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
+
     if (!fail_list.empty()) {
         wxString message = _L("Unable to reload:") + "\n";
         for (const wxString& s : fail_list) {
@@ -3536,27 +3739,6 @@ void Plater::priv::reload_all_from_disk()
     }
 }
 
-void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* = -1*/)
-{
-    if (obj_idx < 0)
-        return;
-
-    // Do not fix anything when a gizmo is open. There might be issues with updates
-    // and what is worse, the snapshot time would refer to the internal stack.
-    if (! q->canvas3D()->get_gizmos_manager().check_gizmos_closed_except(GLGizmosManager::Undefined))
-        return;
-
-    // size_t snapshot_time = undo_redo_stack().active_snapshot_time();
-    Plater::TakeSnapshot snapshot(q, _L("Fix through NetFabb"));
-
-    q->clear_before_change_mesh(obj_idx);
-    ModelObject* mo = model.objects[obj_idx];
-    fix_model_by_win10_sdk_gui(*mo, vol_idx);
-    q->changed_mesh(obj_idx);
-    // workaround to fix the issue, when PrusaSlicer lose a focus after model fixing
-    q->SetFocus();
-}
-
 void Plater::priv::create_simplify_notification(const std::vector<size_t>& obj_ids) {
     const uint32_t triangles_to_suggest_simplify = 1000000;
 
@@ -3581,8 +3763,8 @@ void Plater::priv::create_simplify_notification(const std::vector<size_t>& obj_i
             "amount of triangles.");
         t.replace(t.find("@object_name"), sizeof("@object_name") - 1,
                   model.objects[object_id]->name);
-        std::stringstream text;
-        text << _u8L("WARNING:") << "\n" << t << "\n";
+        //std::stringstream text;
+        //text << t << "\n";
         std::string hypertext = _u8L("Simplify model");
 
         std::function<bool(wxEvtHandler *)> open_simplify = [object_id](wxEvtHandler *) {
@@ -3597,7 +3779,10 @@ void Plater::priv::create_simplify_notification(const std::vector<size_t>& obj_i
             manager.open_gizmo(GLGizmosManager::EType::Simplify);
             return true;
         };
-        notification_manager->push_object_warning_notification(text.str(), model.objects[object_id]->id(), hypertext, open_simplify);
+        notification_manager->push_simplify_suggestion_notification(t, 
+                                                                    model.objects[object_id]->id(), 
+                                                                    hypertext, 
+                                                                    open_simplify);
     }
 }
 
@@ -3646,10 +3831,10 @@ void Plater::priv::set_current_panel(wxPanel* panel)
 
         if (view3D->is_reload_delayed()) {
             // Delayed loading of the 3D scene.
-            if (this->printer_technology == ptSLA) {
+            if (printer_technology == ptSLA) {
                 // Update the SLAPrint from the current Model, so that the reload_scene()
                 // pulls the correct data.
-                this->update_restart_background_process(true, false);
+                update_restart_background_process(true, false);
             } else
                 view3D->reload_scene(true);
         }
@@ -3672,8 +3857,12 @@ void Plater::priv::set_current_panel(wxPanel* panel)
         // FIXME: it may be better to have a single function making this check and let it be called wherever needed
         bool export_in_progress = this->background_process.is_export_scheduled();
         bool model_fits = view3D->get_canvas3d()->check_volumes_outside_state() != ModelInstancePVS_Partly_Outside;
-        if (!model.objects.empty() && !export_in_progress && model_fits)
-            this->q->reslice();
+        if (!model.objects.empty() && !export_in_progress && model_fits) {
+#if ENABLE_SEAMS_USING_MODELS
+            preview->get_canvas3d()->init_gcode_viewer();
+#endif // ENABLE_SEAMS_USING_MODELS
+            q->reslice();
+        }
         // keeps current gcode preview, if any
         preview->reload_print(true);
 
@@ -3814,20 +4003,16 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
 
 void Plater::priv::on_slicing_completed(wxCommandEvent & evt)
 {
-    switch (this->printer_technology) {
-    case ptFFF:
-        this->update_fff_scene();
-        break;
-    case ptSLA:
-        if (view3D->is_dragging())
-            delayed_scene_refresh = true;
+    if (view3D->is_dragging()) // updating scene now would interfere with the gizmo dragging
+        delayed_scene_refresh = true;
+    else {
+        if (this->printer_technology == ptFFF)
+            this->update_fff_scene();
         else
             this->update_sla_scene();
-        break;
-    default: break;
     }
-
 }
+
 void Plater::priv::on_export_began(wxCommandEvent& evt)
 {
 	if (show_warning_dialog)
@@ -3838,6 +4023,7 @@ void Plater::priv::on_slicing_began()
 	clear_warnings();
     notification_manager->close_notification_of_type(NotificationType::SignDetected);
     notification_manager->close_notification_of_type(NotificationType::ExportFinished);
+    notification_manager->set_slicing_progress_began();
 }
 void Plater::priv::add_warning(const Slic3r::PrintStateBase::Warning& warning, size_t oid)
 {
@@ -3869,7 +4055,7 @@ void Plater::priv::actualize_object_warnings(const PrintBase& print)
         ids.push_back(object->id());
     }
     std::sort(ids.begin(), ids.end());
-    notification_manager->remove_object_warnings_of_released_objects(ids);
+    notification_manager->remove_simplify_suggestion_of_released_objects(ids);
 }
 void Plater::priv::clear_warnings()
 {
@@ -3913,12 +4099,14 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt)
     if (evt.error()) {
         std::pair<std::string, bool> message = evt.format_error_message();
         if (evt.critical_error()) {
-            if (q->m_tracking_popup_menu)
+            if (q->m_tracking_popup_menu) {
                 // We don't want to pop-up a message box when tracking a pop-up menu.
                 // We postpone the error message instead.
                 q->m_tracking_popup_menu_error_message = message.first;
-            else
+            } else {
                 show_error(q, message.first, message.second);
+                notification_manager->set_slicing_progress_hidden();
+            }
         } else
             notification_manager->push_slicing_error_notification(message.first);
 //        this->statusbar()->set_status_text(from_u8(message.first));
@@ -3933,7 +4121,7 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt)
     }
     if (evt.cancelled()) {
 //        this->statusbar()->set_status_text(_L("Cancelled"));
-        this->notification_manager->set_slicing_progress_percentage(_utf8("Slicing Cancelled."), -1);
+        this->notification_manager->set_slicing_progress_canceled(_utf8("Slicing Cancelled."));
     }
 
     this->sidebar->show_sliced_info_sizer(evt.success());
@@ -3944,17 +4132,13 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt)
     this->object_list_changed();
 
     // refresh preview
-    switch (this->printer_technology) {
-    case ptFFF:
-        this->update_fff_scene();
-        break;
-    case ptSLA:
-        if (view3D->is_dragging())
-            delayed_scene_refresh = true;
+    if (view3D->is_dragging()) // updating scene now would interfere with the gizmo dragging
+        delayed_scene_refresh = true;
+    else {
+        if (this->printer_technology == ptFFF)
+            this->update_fff_scene();
         else
             this->update_sla_scene();
-        break;
-    default: break;
     }
 	
     if (evt.cancelled()) {
@@ -4036,11 +4220,14 @@ void Plater::priv::on_right_click(RBtnEvent& evt)
         if (printer_technology == ptSLA)
             menu = menus.sla_object_menu();
         else {
+            const Selection& selection = get_selection();
             // show "Object menu" for each one or several FullInstance instead of FullObject
-            const bool is_some_full_instances = get_selection().is_single_full_instance() || 
-                                                get_selection().is_single_full_object() || 
-                                                get_selection().is_multiple_full_instance();
-            menu = is_some_full_instances ? menus.object_menu() : menus.part_menu();
+            const bool is_some_full_instances = selection.is_single_full_instance() || 
+                                                selection.is_single_full_object() || 
+                                                selection.is_multiple_full_instance();
+            const bool is_part = selection.is_single_volume() || selection.is_single_modifier();
+            menu = is_some_full_instances   ? menus.object_menu() : 
+                   is_part                  ? menus.part_menu()   : menus.multi_selection_menu();
         }
     }
 
@@ -4145,7 +4332,10 @@ void Plater::priv::init_notification_manager()
     notification_manager->init();
 
     auto cancel_callback = [this]() {
+        if (this->background_process.idle())
+            return false;
         this->background_process.stop();
+        return true;
     };
     notification_manager->init_slicing_progress_notification(cancel_callback);
     notification_manager->set_fff(printer_technology == ptFFF);
@@ -4393,14 +4583,29 @@ bool Plater::priv::can_delete_all() const
 
 bool Plater::priv::can_fix_through_netfabb() const
 {
-    int obj_idx = get_selected_object_idx();
-    if (obj_idx < 0)
+    std::vector<int> obj_idxs, vol_idxs;
+    sidebar->obj_list()->get_selection_indexes(obj_idxs, vol_idxs);
+
+#if FIX_THROUGH_NETFABB_ALWAYS
+    // Fixing always.
+    return ! obj_idxs.empty() || ! vol_idxs.empty();
+#else // FIX_THROUGH_NETFABB_ALWAYS
+    // Fixing only if the model is not manifold.
+    if (vol_idxs.empty()) {
+        for (auto obj_idx : obj_idxs)
+            if (model.objects[obj_idx]->get_repaired_errors_count() > 0)
+                return true;
         return false;
+    }
 
-    return model.objects[obj_idx]->get_mesh_errors_count() > 0;
+    int obj_idx = obj_idxs.front();
+    for (auto vol_idx : vol_idxs)
+        if (model.objects[obj_idx]->get_repaired_errors_count(vol_idx) > 0)
+            return true;
+    return false;
+#endif // FIX_THROUGH_NETFABB_ALWAYS
 }
 
-
 bool Plater::priv::can_simplify() const
 {
     // is object for simplification selected
@@ -4518,12 +4723,13 @@ int Plater::priv::get_active_snapshot_index()
     return it - ss_stack.begin();
 }
 
-void Plater::priv::take_snapshot(const std::string& snapshot_name)
+void Plater::priv::take_snapshot(const std::string& snapshot_name, const UndoRedo::SnapshotType snapshot_type)
 {
     if (m_prevent_snapshots > 0)
         return;
     assert(m_prevent_snapshots >= 0);
     UndoRedo::SnapshotData snapshot_data;
+    snapshot_data.snapshot_type      = snapshot_type;
     snapshot_data.printer_technology = this->printer_technology;
     if (this->view3D->is_layers_editing_enabled())
         snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE;
@@ -4550,10 +4756,25 @@ void Plater::priv::take_snapshot(const std::string& snapshot_name)
         model.wipe_tower.position = Vec2d(config.opt_float("wipe_tower_x"), config.opt_float("wipe_tower_y"));
         model.wipe_tower.rotation = config.opt_float("wipe_tower_rotation_angle");
     }
-    this->undo_redo_stack().take_snapshot(snapshot_name, model, view3D->get_canvas3d()->get_selection(), view3D->get_canvas3d()->get_gizmos_manager(), snapshot_data);
+    const GLGizmosManager& gizmos = view3D->get_canvas3d()->get_gizmos_manager();
+
+    if (snapshot_type == UndoRedo::SnapshotType::ProjectSeparator && wxGetApp().app_config->get("clear_undo_redo_stack_on_new_project") == "1")
+        this->undo_redo_stack().clear();
+    this->undo_redo_stack().take_snapshot(snapshot_name, model, view3D->get_canvas3d()->get_selection(), gizmos, snapshot_data);
+    if (snapshot_type == UndoRedo::SnapshotType::LeavingGizmoWithAction) {
+        // Filter all but the last UndoRedo::SnapshotType::GizmoAction in a row between the last UndoRedo::SnapshotType::EnteringGizmo and UndoRedo::SnapshotType::LeavingGizmoWithAction.
+        // The remaining snapshot will be renamed to a more generic name,
+        // depending on what gizmo is being left.
+        assert(gizmos.get_current() != nullptr);
+        std::string new_name = gizmos.get_current()->get_action_snapshot_name();
+        this->undo_redo_stack().reduce_noisy_snapshots(new_name);
+    } else if (snapshot_type == UndoRedo::SnapshotType::ProjectSeparator) {
+        // Reset the "dirty project" flag.
+        m_undo_redo_stack_main.mark_current_as_saved();
+    }
     this->undo_redo_stack().release_least_recently_used();
 
-    dirty_state.update_from_undo_redo_stack(ProjectDirtyStateManager::UpdateType::TakeSnapshot);
+    dirty_state.update_from_undo_redo_stack(m_undo_redo_stack_main.project_modified());
 
     // Save the last active preset name of a particular printer technology.
     ((this->printer_technology == ptFFF) ? m_last_fff_printer_profile_name : m_last_sla_printer_profile_name) = wxGetApp().preset_bundle->printers.get_selected_preset_name();
@@ -4595,8 +4816,10 @@ void Plater::priv::undo_redo_to(std::vector<UndoRedo::Snapshot>::const_iterator
     if (printer_technology_changed) {
         // Switching the printer technology when jumping forwards / backwards in time. Switch to the last active printer profile of the other type.
         std::string s_pt = (it_snapshot->snapshot_data.printer_technology == ptFFF) ? "FFF" : "SLA";
-        if (!wxGetApp().check_and_save_current_preset_changes(format_wxstr(_L(
-            "%1% printer was active at the time the target Undo / Redo snapshot was taken. Switching to %1% printer requires reloading of %1% presets."), s_pt)))
+        if (!wxGetApp().check_and_save_current_preset_changes(_L("Undo / Redo is processing"), 
+//            format_wxstr(_L("%1% printer was active at the time the target Undo / Redo snapshot was taken. Switching to %1% printer requires reloading of %1% presets."), s_pt)))
+            format_wxstr(_L("Switching the printer technology from %1% to %2%.\n"
+                            "Some %1% presets were modified, which will be lost after switching the printer technology."), s_pt =="FFF" ? "SLA" : "FFF", s_pt), false))
             // Don't switch the profiles.
             return;
     }
@@ -4688,7 +4911,7 @@ void Plater::priv::undo_redo_to(std::vector<UndoRedo::Snapshot>::const_iterator
             view3D->get_canvas3d()->force_main_toolbar_left_action(view3D->get_canvas3d()->get_main_toolbar_item_id("layersediting"));
     }
 
-    dirty_state.update_from_undo_redo_stack(ProjectDirtyStateManager::UpdateType::UndoRedoTo);
+    dirty_state.update_from_undo_redo_stack(m_undo_redo_stack_main.project_modified());
 }
 
 void Plater::priv::update_after_undo_redo(const UndoRedo::Snapshot& snapshot, bool /* temp_snapshot_was_taken */)
@@ -4774,7 +4997,7 @@ Plater::Plater(wxWindow *parent, MainFrame *main_frame)
 
 bool Plater::is_project_dirty() const { return p->is_project_dirty(); }
 void Plater::update_project_dirty_from_presets() { p->update_project_dirty_from_presets(); }
-int  Plater::save_project_if_dirty() { return p->save_project_if_dirty(); }
+int  Plater::save_project_if_dirty(const wxString& reason) { return p->save_project_if_dirty(reason); }
 void Plater::reset_project_dirty_after_save() { p->reset_project_dirty_after_save(); }
 void Plater::reset_project_dirty_initial_presets() { p->reset_project_dirty_initial_presets(); }
 #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
@@ -4791,11 +5014,23 @@ SLAPrint&       Plater::sla_print()         { return p->sla_print; }
 
 void Plater::new_project()
 {
-    if (p->save_project_if_dirty() == wxID_CANCEL)
+    if (int saved_project = p->save_project_if_dirty(_L("Creating a new project while the current project is modified.")); saved_project == wxID_CANCEL)
         return;
+    else {
+        wxString header = _L("Creating a new project while some presets are modified.") + "\n" + 
+                          (saved_project == wxID_YES ? _L("You can keep presets modifications to the new project or discard them") :
+                          _L("You can keep presets modifications to the new project, discard them or save changes as new presets.\n"
+                             "Note, if changes will be saved than new project wouldn't keep them"));
+        using ab = UnsavedChangesDialog::ActionButtons;
+        int act_buttons = ab::KEEP;
+        if (saved_project == wxID_NO)
+            act_buttons |= ab::SAVE;
+        if (!wxGetApp().check_and_keep_current_preset_changes(_L("New Project is creating"), header, act_buttons))
+            return;
+    }
 
     p->select_view_3D("3D");
-    take_snapshot(_L("New Project"));
+    take_snapshot(_L("New Project"), UndoRedo::SnapshotType::ProjectSeparator);
     Plater::SuppressSnapshots suppress(this);
     reset();
     reset_project_dirty_initial_presets();
@@ -4804,7 +5039,7 @@ void Plater::new_project()
 
 void Plater::load_project()
 {
-    if (p->save_project_if_dirty() == wxID_CANCEL)
+    if (!wxGetApp().can_load_project())
         return;
 
     // Ask user for a project file name.
@@ -4820,7 +5055,7 @@ void Plater::load_project(const wxString& filename)
         return;
 
     // Take the Undo / Redo snapshot.
-    Plater::TakeSnapshot snapshot(this, _L("Load Project") + ": " + wxString::FromUTF8(into_path(filename).stem().string().c_str()));
+    Plater::TakeSnapshot snapshot(this, _L("Load Project") + ": " + wxString::FromUTF8(into_path(filename).stem().string().c_str()), UndoRedo::SnapshotType::ProjectSeparator);
 
     p->reset();
 
@@ -5100,7 +5335,8 @@ bool Plater::load_files(const wxArrayString& filenames)
 
             switch (load_type) {
             case LoadType::OpenProject: {
-                load_project(from_path(*it));
+                if (wxGetApp().can_load_project())
+                    load_project(from_path(*it));
                 break;
             }
             case LoadType::LoadGeometry: {
@@ -5464,11 +5700,9 @@ void Plater::export_stl(bool extended, bool selection_only)
         for (const ModelVolume *v : mo->volumes)
             if (v->is_model_part()) {
                 TriangleMesh vol_mesh(v->mesh());
-                vol_mesh.repair();
                 vol_mesh.transform(v->get_matrix(), true);
                 mesh.merge(vol_mesh);
             }
-        mesh.repair();
         if (instances) {
             TriangleMesh vols_mesh(mesh);
             mesh = TriangleMesh();
@@ -5478,7 +5712,6 @@ void Plater::export_stl(bool extended, bool selection_only)
                 mesh.merge(m);
             }
         }
-        mesh.repair();
         return mesh;
     };
 
@@ -5838,6 +6071,8 @@ void Plater::eject_drive()
 
 void Plater::take_snapshot(const std::string &snapshot_name) { p->take_snapshot(snapshot_name); }
 void Plater::take_snapshot(const wxString &snapshot_name) { p->take_snapshot(snapshot_name); }
+void Plater::take_snapshot(const std::string &snapshot_name, UndoRedo::SnapshotType snapshot_type) { p->take_snapshot(snapshot_name, snapshot_type); }
+void Plater::take_snapshot(const wxString &snapshot_name, UndoRedo::SnapshotType snapshot_type) { p->take_snapshot(snapshot_name, snapshot_type); }
 void Plater::suppress_snapshots() { p->suppress_snapshots(); }
 void Plater::allow_snapshots() { p->allow_snapshots(); }
 void Plater::undo() { p->undo(); }
@@ -6105,7 +6340,6 @@ std::vector<std::string> Plater::get_colors_for_color_print(const GCodeProcessor
     std::vector<std::string> colors = get_extruder_colors_from_plater_config(result);
     colors.reserve(colors.size() + p->model.custom_gcode_per_print_z.gcodes.size());
 
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     if (wxGetApp().is_gcode_viewer() && result != nullptr) {
         for (const CustomGCode::Item& code : result->custom_gcode_per_print_z) {
             if (code.type == CustomGCode::ColorChange)
@@ -6113,14 +6347,11 @@ std::vector<std::string> Plater::get_colors_for_color_print(const GCodeProcessor
         }
     }
     else {
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
         for (const CustomGCode::Item& code : p->model.custom_gcode_per_print_z.gcodes) {
             if (code.type == CustomGCode::ColorChange)
                 colors.emplace_back(code.color);
         }
-#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
     }
-#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
 
     return colors;
 }
@@ -6229,6 +6460,7 @@ bool Plater::set_printer_technology(PrinterTechnology printer_technology)
     p->sidebar->get_searcher().set_printer_technology(printer_technology);
 
     p->notification_manager->set_fff(printer_technology == ptFFF);
+    p->notification_manager->set_slicing_progress_hidden();
 
     return ret;
 }
@@ -6250,7 +6482,7 @@ void Plater::clear_before_change_mesh(int obj_idx)
         // snapshot_time is captured by copy so the lambda knows where to undo/redo to.
         get_notification_manager()->push_notification(
                     NotificationType::CustomSupportsAndSeamRemovedAfterRepair,
-                    NotificationManager::NotificationLevel::RegularNotificationLevel,
+                    NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
                     _u8L("Custom supports, seams and multimaterial painting were "
                          "removed after repairing the mesh."));
 //                    _u8L("Undo the repair"),
@@ -6344,7 +6576,6 @@ void Plater::suppress_background_process(const bool stop_background_process)
     this->p->suppressed_backround_processing_update = true;
 }
 
-void Plater::fix_through_netfabb(const int obj_idx, const int vol_idx/* = -1*/) { p->fix_through_netfabb(obj_idx, vol_idx); }
 void Plater::mirror(Axis axis)      { p->mirror(axis); }
 void Plater::split_object()         { p->split_object(); }
 void Plater::split_volume()         { p->split_volume(); }
@@ -6393,12 +6624,7 @@ void Plater::search(bool plater_is_active)
         canvas3D()->on_char(evt);
     }
     else
-    {
-        wxPoint pos = this->ClientToScreen(wxPoint(0, 0));
-        pos.x += em_unit(this) * 40;
-        pos.y += em_unit(this) * 4;
-        p->sidebar->get_searcher().search_dialog->Popup(pos);
-    }
+        p->sidebar->get_searcher().show_dialog();
 }
 
 void Plater::msw_rescale()
@@ -6529,9 +6755,14 @@ Mouse3DController& Plater::get_mouse3d_controller()
     return p->mouse3d_controller;
 }
 
-std::shared_ptr<NotificationManager> Plater::get_notification_manager()
+NotificationManager * Plater::get_notification_manager()
 {
-	return p->notification_manager;
+    return p->notification_manager.get();
+}
+
+const NotificationManager * Plater::get_notification_manager() const
+{
+    return p->notification_manager.get();
 }
 
 void Plater::init_notification_manager()
@@ -6591,7 +6822,6 @@ bool Plater::can_mirror() const { return p->can_mirror(); }
 bool Plater::can_split(bool to_objects) const { return p->can_split(to_objects); }
 const UndoRedo::Stack& Plater::undo_redo_stack_main() const { return p->undo_redo_stack_main(); }
 void Plater::clear_undo_redo_stack_main() { p->undo_redo_stack_main().clear(); }
-const UndoRedo::Stack& Plater::undo_redo_stack_active() const { return p->undo_redo_stack(); }
 void Plater::enter_gizmos_stack() { p->enter_gizmos_stack(); }
 void Plater::leave_gizmos_stack() { p->leave_gizmos_stack(); }
 bool Plater::inside_snapshot_capture() { return p->inside_snapshot_capture(); }
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp
index 4a98797e5..0e9d28c1a 100644
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -37,6 +37,7 @@ using ModelInstancePtrs = std::vector<ModelInstance*>;
 
 namespace UndoRedo {
     class Stack;
+    enum class SnapshotType : unsigned char;
     struct Snapshot;
 }
 
@@ -140,7 +141,7 @@ public:
 
     bool is_project_dirty() const;
     void update_project_dirty_from_presets();
-    int  save_project_if_dirty();
+    int  save_project_if_dirty(const wxString& reason);
     void reset_project_dirty_after_save();
     void reset_project_dirty_initial_presets();
 #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
@@ -235,12 +236,14 @@ public:
     void schedule_background_process(bool schedule = true);
     bool is_background_process_update_scheduled() const;
     void suppress_background_process(const bool stop_background_process) ;
-    void fix_through_netfabb(const int obj_idx, const int vol_idx = -1);
     void send_gcode();
 	void eject_drive();
 
     void take_snapshot(const std::string &snapshot_name);
     void take_snapshot(const wxString &snapshot_name);
+    void take_snapshot(const std::string &snapshot_name, UndoRedo::SnapshotType snapshot_type);
+    void take_snapshot(const wxString &snapshot_name, UndoRedo::SnapshotType snapshot_type);
+
     void undo();
     void redo();
     void undo_to(int selection);
@@ -251,7 +254,6 @@ public:
     // For the memory statistics. 
     const Slic3r::UndoRedo::Stack& undo_redo_stack_main() const;
     void clear_undo_redo_stack_main();
-    const Slic3r::UndoRedo::Stack& undo_redo_stack_active() const;
     // Enter / leave the Gizmos specific Undo / Redo stack. To be used by the SLA support point editing gizmo.
     void enter_gizmos_stack();
     void leave_gizmos_stack();
@@ -359,7 +361,9 @@ public:
 	void set_bed_shape() const;
     void set_bed_shape(const Pointfs& shape, const std::string& custom_texture, const std::string& custom_model, bool force_as_custom = false) const;
 
-	std::shared_ptr<NotificationManager> get_notification_manager();
+    NotificationManager * get_notification_manager();
+    const NotificationManager * get_notification_manager() const;
+
     void init_notification_manager();
 
     void bring_instance_forward();
@@ -390,6 +394,12 @@ public:
 			m_plater->take_snapshot(snapshot_name);
 			m_plater->suppress_snapshots();
 		}
+        TakeSnapshot(Plater *plater, const wxString &snapshot_name, UndoRedo::SnapshotType snapshot_type) : m_plater(plater)
+        {
+            m_plater->take_snapshot(snapshot_name, snapshot_type);
+            m_plater->suppress_snapshots();
+        }
+
 		~TakeSnapshot()
 		{
 			m_plater->allow_snapshots();
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 53c93b6b0..880723693 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -73,7 +73,7 @@ void PreferencesDialog::build(size_t selected_tab)
 	// Add "General" tab
 	m_optgroup_general = create_options_tab(_L("General"), tabs);
 	m_optgroup_general->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
-		if (opt_key == "default_action_on_close_application" || opt_key == "default_action_on_select_preset")
+		if (opt_key == "default_action_on_close_application" || opt_key == "default_action_on_select_preset" || opt_key == "default_action_on_new_project")
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "none" : "discard";
 		else
 		    m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
@@ -186,19 +186,28 @@ void PreferencesDialog::build(size_t selected_tab)
 		option = Option(def, "single_instance");
 		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Ask for unsaved changes when closing application");
+		def.label = L("Ask for unsaved changes when closing application or loading new project");
 		def.type = coBool;
-		def.tooltip = L("When closing the application, always ask for unsaved changes");
+		def.tooltip = L("Always ask for unsaved changes, when: \n"
+						"- Closing PrusaSlicer while some presets are modified,\n"
+						"- Loading a new project while some presets are modified");
 		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_close_application") == "none" });
 		option = Option(def, "default_action_on_close_application");
 		m_optgroup_general->append_single_option_line(option);
 
 		def.label = L("Ask for unsaved changes when selecting new preset");
 		def.type = coBool;
-		def.tooltip = L("Always ask for unsaved changes when selecting new preset");
+		def.tooltip = L("Always ask for unsaved changes when selecting new preset or resetting a preset");
 		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_select_preset") == "none" });
 		option = Option(def, "default_action_on_select_preset");
 		m_optgroup_general->append_single_option_line(option);
+
+		def.label = L("Ask for unsaved changes when creating new project");
+		def.type = coBool;
+		def.tooltip = L("Always ask for unsaved changes when creating new project");
+		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_new_project") == "none" });
+		option = Option(def, "default_action_on_new_project");
+		m_optgroup_general->append_single_option_line(option);
 	}
 #ifdef _WIN32
 	else {
@@ -229,6 +238,14 @@ void PreferencesDialog::build(size_t selected_tab)
 	option = Option(def, "show_splash_screen");
 	m_optgroup_general->append_single_option_line(option);
 
+    // Clear Undo / Redo stack on new project
+	def.label = L("Clear Undo / Redo stack on new project");
+	def.type = coBool;
+	def.tooltip = L("Clear Undo / Redo stack on new project or when an existing project is loaded.");
+	def.set_default_value(new ConfigOptionBool{ app_config->get("clear_undo_redo_stack_on_new_project") == "1" });
+	option = Option(def, "clear_undo_redo_stack_on_new_project");
+	m_optgroup_general->append_single_option_line(option);
+
 #if defined(_WIN32) || defined(__APPLE__)
 	def.label = L("Enable support for legacy 3DConnexion devices");
 	def.type = coBool;
@@ -619,8 +636,8 @@ void PreferencesDialog::create_settings_mode_widget()
             m_values["old_settings_layout_mode"] = (id == 0) ? "1" : "0";
 #ifdef _MSW_DARK_MODE
 			if (!disable_new_layout)
-            m_values["new_settings_layout_mode"] = (id == 1) ? "1" : "0";
 #endif
+            m_values["new_settings_layout_mode"] = (id == 1) ? "1" : "0";
             m_values["dlg_settings_layout_mode"] = (id == dlg_id) ? "1" : "0";
 		});
 		id++;
diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.cpp b/src/slic3r/GUI/ProjectDirtyStateManager.cpp
index 3ca764e91..ecf596634 100644
--- a/src/slic3r/GUI/ProjectDirtyStateManager.cpp
+++ b/src/slic3r/GUI/ProjectDirtyStateManager.cpp
@@ -6,7 +6,6 @@
 #include "MainFrame.hpp"
 #include "I18N.hpp"
 #include "Plater.hpp"
-#include "../Utils/UndoRedo.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
@@ -16,224 +15,38 @@
 namespace Slic3r {
 namespace GUI {
 
-enum class EStackType
+void ProjectDirtyStateManager::update_from_undo_redo_stack(bool dirty)
 {
-    Main,
-    Gizmo
-};
-
-// returns the current active snapshot (the topmost snapshot in the undo part of the stack) in the given stack
-static const UndoRedo::Snapshot* get_active_snapshot(const UndoRedo::Stack& stack) {
-    const std::vector<UndoRedo::Snapshot>& snapshots = stack.snapshots();
-    const size_t active_snapshot_time = stack.active_snapshot_time();
-    const auto it = std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(active_snapshot_time));
-    const int idx = it - snapshots.begin() - 1;
-    const Slic3r::UndoRedo::Snapshot* ret = (0 <= idx && idx < int(snapshots.size()) - 1) ?
-        &snapshots[idx] : nullptr;
-
-    assert(ret != nullptr);
-    return ret;
-}
-
-// returns the last saveable snapshot (the topmost snapshot in the undo part of the stack that can be saved) in the given stack
-static const UndoRedo::Snapshot* get_last_saveable_snapshot(EStackType type, const UndoRedo::Stack& stack,
-    const ProjectDirtyStateManager::DirtyState::Gizmos& gizmos, size_t last_save_main) {
-
-    // returns true if the given snapshot is not saveable
-    auto skip_main = [&gizmos, last_save_main, &stack](const UndoRedo::Snapshot& snapshot) {
-        auto is_gizmo_with_modifications = [&gizmos, &stack](const UndoRedo::Snapshot& snapshot) {
-            if (boost::starts_with(snapshot.name, _utf8("Entering"))) {
-                if (gizmos.current)
-                    return true;
-
-                std::string topmost_redo;
-                wxGetApp().plater()->undo_redo_topmost_string_getter(false, topmost_redo);
-                if (boost::starts_with(topmost_redo, _utf8("Leaving"))) {
-                    const std::vector<UndoRedo::Snapshot>& snapshots = stack.snapshots();
-                    const UndoRedo::Snapshot* leaving_snapshot = &(*std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(snapshot.timestamp + 1)));
-                    if (gizmos.is_used_and_modified(*leaving_snapshot))
-                        return true;
-                }
-            }
-            return false;
-        };
-
-        if (snapshot.name == _utf8("New Project"))
-            return true;
-        else if (snapshot.name == _utf8("Reset Project"))
-            return true;
-        else if (boost::starts_with(snapshot.name, _utf8("Load Project")))
-            return true;
-        else if (boost::starts_with(snapshot.name, _utf8("Selection")))
-            return true;
-        else if (boost::starts_with(snapshot.name, _utf8("Entering"))) {
-            if (last_save_main != snapshot.timestamp + 1 && !is_gizmo_with_modifications(snapshot))
-                return true;
-        }
-        else if (boost::starts_with(snapshot.name, _utf8("Leaving"))) {
-            if (last_save_main != snapshot.timestamp && !gizmos.is_used_and_modified(snapshot))
-                return true;
-        }
-        
-        return false;
-    };
-
-    // returns true if the given snapshot is not saveable
-    auto skip_gizmo = [](const UndoRedo::Snapshot& snapshot) {
-        // put here any needed condition to skip the snapshot
-        return false;
-    };
-
-    const UndoRedo::Snapshot* curr = get_active_snapshot(stack);
-    const std::vector<UndoRedo::Snapshot>& snapshots = stack.snapshots();
-    size_t shift = 1;
-    while (curr->timestamp > 0 && ((type == EStackType::Main && skip_main(*curr)) || (type == EStackType::Gizmo && skip_gizmo(*curr)))) {
-        const UndoRedo::Snapshot* temp = curr;
-        curr = &(*std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(curr->timestamp - shift)));
-        shift = (curr == temp) ? shift + 1 : 1;
-    }
-    if (type == EStackType::Main) {
-        if (boost::starts_with(curr->name, _utf8("Entering")) && last_save_main == curr->timestamp + 1) {
-            std::string topmost_redo;
-            wxGetApp().plater()->undo_redo_topmost_string_getter(false, topmost_redo);
-            if (boost::starts_with(topmost_redo, _utf8("Leaving")))
-                curr = &(*std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(curr->timestamp + 1)));
-        }
-    }
-    return curr->timestamp > 0 ? curr : nullptr;
-}
-
-// returns the name of the gizmo contained in the given string
-static std::string extract_gizmo_name(const std::string& s) {
-    static const std::array<std::string, 2> prefixes = { _utf8("Entering"), _utf8("Leaving") };
-
-    std::string ret;
-    for (const std::string& prefix : prefixes) {
-        if (boost::starts_with(s, prefix))
-            ret = s.substr(prefix.length() + 1);
-
-        if (!ret.empty())
-            break;
-    }
-    return ret;
-}
-
-void ProjectDirtyStateManager::DirtyState::Gizmos::add_used(const UndoRedo::Snapshot& snapshot)
-{
-    const std::string name = extract_gizmo_name(snapshot.name);
-    auto it = used.find(name);
-    if (it == used.end())
-        it = used.insert({ name, { {} } }).first;
-
-    it->second.modified_timestamps.push_back(snapshot.timestamp);
-}
-
-void ProjectDirtyStateManager::DirtyState::Gizmos::remove_obsolete_used(const Slic3r::UndoRedo::Stack& main_stack)
-{
-    const std::vector<UndoRedo::Snapshot>& snapshots = main_stack.snapshots();
-    for (auto& item : used) {
-        auto it = item.second.modified_timestamps.begin();
-        while (it != item.second.modified_timestamps.end()) {
-            size_t timestamp = *it;
-            auto snapshot_it = std::find_if(snapshots.begin(), snapshots.end(), [timestamp](const Slic3r::UndoRedo::Snapshot& snapshot) { return snapshot.timestamp == timestamp; });
-            if (snapshot_it == snapshots.end())
-                it = item.second.modified_timestamps.erase(it);
-            else
-                ++it;
-        }
-    }
-}
-
-#if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
-bool ProjectDirtyStateManager::DirtyState::Gizmos::any_used_modified() const
-{
-    for (auto& [name, gizmo] : used) {
-        if (!gizmo.modified_timestamps.empty())
-            return true;
-    }
-    return false;
-}
-#endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
-
-// returns true if the given snapshot is contained in any of the gizmos caches
-bool ProjectDirtyStateManager::DirtyState::Gizmos::is_used_and_modified(const UndoRedo::Snapshot& snapshot) const
-{
-    for (const auto& item : used) {
-        for (size_t i : item.second.modified_timestamps) {
-            if (i == snapshot.timestamp)
-                return true;
-        }
-    }
-    return false;
-}
-
-void ProjectDirtyStateManager::DirtyState::Gizmos::reset()
-{
-    used.clear();
-}
-
-void ProjectDirtyStateManager::update_from_undo_redo_stack(UpdateType type)
-{
-    if (!wxGetApp().initialized())
-        return;
-
-    const Plater* plater = wxGetApp().plater();
-    if (plater == nullptr)
-        return;
-
-    const UndoRedo::Stack& main_stack = plater->undo_redo_stack_main();
-    const UndoRedo::Stack& active_stack = plater->undo_redo_stack_active();
-
-    if (&main_stack == &active_stack)
-        update_from_undo_redo_main_stack(type, main_stack);
-    else
-        update_from_undo_redo_gizmo_stack(type, active_stack);
-
-    wxGetApp().mainframe->update_title();
+    m_plater_dirty = dirty;
+    if (const Plater *plater = wxGetApp().plater(); plater && wxGetApp().initialized())
+        wxGetApp().mainframe->update_title();
 }
 
 void ProjectDirtyStateManager::update_from_presets()
 {
-    m_state.presets = false;
-    for (const auto& [type, name] : wxGetApp().get_selected_presets()) {
-        m_state.presets |= !m_initial_presets[type].empty() && m_initial_presets[type] != name;
+    m_presets_dirty = false;
+    // check switching of the presets only for exist/loaded project, but not for new
+    if (!wxGetApp().plater()->get_project_filename().IsEmpty()) {
+        for (const auto& [type, name] : wxGetApp().get_selected_presets())
+            m_presets_dirty |= !m_initial_presets[type].empty() && m_initial_presets[type] != name;
     }
-    m_state.presets |= wxGetApp().has_unsaved_preset_changes();
+    m_presets_dirty |= wxGetApp().has_unsaved_preset_changes();
     wxGetApp().mainframe->update_title();
 }
 
 void ProjectDirtyStateManager::reset_after_save()
 {
-    const Plater* plater = wxGetApp().plater();
-    const UndoRedo::Stack& main_stack = plater->undo_redo_stack_main();
-    const UndoRedo::Stack& active_stack = plater->undo_redo_stack_active();
-
-    if (&main_stack == &active_stack) {
-        const UndoRedo::Snapshot* saveable_snapshot = get_last_saveable_snapshot(EStackType::Main, main_stack, m_state.gizmos, m_last_save.main);
-        m_last_save.main = (saveable_snapshot != nullptr) ? saveable_snapshot->timestamp : 0;
-    }
-    else {
-        // Gizmo is active with its own Undo / Redo stack (for example the SLA support point editing gizmo).
-        const UndoRedo::Snapshot* main_active_snapshot = get_active_snapshot(main_stack);
-        if (boost::starts_with(main_active_snapshot->name, _utf8("Entering"))) {
-            if (m_state.gizmos.current)
-                m_last_save.main = main_active_snapshot->timestamp + 1;
-        }
-        const UndoRedo::Snapshot* saveable_snapshot = get_last_saveable_snapshot(EStackType::Gizmo, active_stack, m_state.gizmos, m_last_save.main);
-        m_last_save.gizmo = (saveable_snapshot != nullptr) ? saveable_snapshot->timestamp : 0;
-    }
-
-    reset_initial_presets();
-    m_state.reset();
+    this->reset_initial_presets();
+    m_plater_dirty  = false;
+    m_presets_dirty = false;
     wxGetApp().mainframe->update_title();
 }
 
 void ProjectDirtyStateManager::reset_initial_presets()
 {
-    m_initial_presets = std::array<std::string, Preset::TYPE_COUNT>();
-    for (const auto& [type, name] : wxGetApp().get_selected_presets()) {
+    m_initial_presets.fill(std::string{});
+    for (const auto& [type, name] : wxGetApp().get_selected_presets())
         m_initial_presets[type] = name;
-    }
 }
 
 #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
@@ -322,89 +135,10 @@ void ProjectDirtyStateManager::render_debug_window() const
         }
     }
 
-    if (m_state.gizmos.any_used_modified()) {
-        if (ImGui::CollapsingHeader("Gizmos", ImGuiTreeNodeFlags_DefaultOpen)) {
-            ImGui::Indent(10.0f);
-            for (const auto& [name, gizmo] : m_state.gizmos.used) {
-                if (!gizmo.modified_timestamps.empty()) {
-                    if (ImGui::CollapsingHeader(name.c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
-                        std::string modified_timestamps;
-                        for (size_t i = 0; i < gizmo.modified_timestamps.size(); ++i) {
-                            if (i > 0)
-                                modified_timestamps += " | ";
-                            modified_timestamps += std::to_string(gizmo.modified_timestamps[i]);
-                        }
-                        imgui.text(modified_timestamps);
-                    }
-                }
-            }
-            ImGui::Unindent(10.0f);
-        }
-    }
-
     imgui.end();
 }
 #endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
 
-void ProjectDirtyStateManager::update_from_undo_redo_main_stack(UpdateType type, const Slic3r::UndoRedo::Stack& stack)
-{
-    m_state.plater = false;
-
-    if (type == UpdateType::TakeSnapshot) {
-        if (m_last_save.main != 0) {
-            const std::vector<UndoRedo::Snapshot>& snapshots = stack.snapshots();
-            auto snapshot_it = std::find_if(snapshots.begin(), snapshots.end(), [this](const Slic3r::UndoRedo::Snapshot& snapshot) { return snapshot.timestamp == m_last_save.main; });
-            if (snapshot_it == snapshots.end())
-                m_last_save.main = 0;
-        }
-        m_state.gizmos.remove_obsolete_used(stack);
-    }
-
-    const UndoRedo::Snapshot* active_snapshot = get_active_snapshot(stack);
-    if (active_snapshot->name == _utf8("New Project") ||
-        active_snapshot->name == _utf8("Reset Project") ||
-        boost::starts_with(active_snapshot->name, _utf8("Load Project")))
-        return;
-
-    if (boost::starts_with(active_snapshot->name, _utf8("Entering"))) {
-        if (type == UpdateType::UndoRedoTo) {
-            std::string topmost_redo;
-            wxGetApp().plater()->undo_redo_topmost_string_getter(false, topmost_redo);
-            if (boost::starts_with(topmost_redo, _utf8("Leaving"))) {
-                const std::vector<UndoRedo::Snapshot>& snapshots = stack.snapshots();
-                const UndoRedo::Snapshot* leaving_snapshot = &(*std::lower_bound(snapshots.begin(), snapshots.end(), UndoRedo::Snapshot(active_snapshot->timestamp + 1)));
-                if (m_state.gizmos.is_used_and_modified(*leaving_snapshot)) {
-                    m_state.plater = (leaving_snapshot != nullptr && leaving_snapshot->timestamp != m_last_save.main);
-                    return;
-                }
-            }
-        }
-        m_state.gizmos.current = false;
-        m_last_save.gizmo = 0;
-    }
-    else if (boost::starts_with(active_snapshot->name, _utf8("Leaving"))) {
-        if (m_state.gizmos.current)
-            m_state.gizmos.add_used(*active_snapshot);
-        m_state.gizmos.current = false;
-        m_last_save.gizmo = 0;
-    }
-
-    const UndoRedo::Snapshot* last_saveable_snapshot = get_last_saveable_snapshot(EStackType::Main, stack, m_state.gizmos, m_last_save.main);
-    m_state.plater = (last_saveable_snapshot != nullptr && last_saveable_snapshot->timestamp != m_last_save.main);
-}
-
-void ProjectDirtyStateManager::update_from_undo_redo_gizmo_stack(UpdateType type, const Slic3r::UndoRedo::Stack& stack)
-{
-    m_state.gizmos.current = false;
-
-    const UndoRedo::Snapshot* active_snapshot = get_active_snapshot(stack);
-    if (active_snapshot->name == "Gizmos-Initial")
-        return;
-
-    const UndoRedo::Snapshot* last_saveable_snapshot = get_last_saveable_snapshot(EStackType::Gizmo, stack, m_state.gizmos, m_last_save.main);
-    m_state.gizmos.current = (last_saveable_snapshot != nullptr && last_saveable_snapshot->timestamp != m_last_save.gizmo);
-}
-
 } // namespace GUI
 } // namespace Slic3r
 
diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.hpp b/src/slic3r/GUI/ProjectDirtyStateManager.hpp
index 2151c9717..574e6912e 100644
--- a/src/slic3r/GUI/ProjectDirtyStateManager.hpp
+++ b/src/slic3r/GUI/ProjectDirtyStateManager.hpp
@@ -4,89 +4,32 @@
 #include "libslic3r/Preset.hpp"
 
 namespace Slic3r {
-namespace UndoRedo {
-class Stack;
-struct Snapshot;
-} // namespace UndoRedo
-
 namespace GUI {
+
 class ProjectDirtyStateManager
 {
-public:
-    enum class UpdateType : unsigned char
-    {
-        TakeSnapshot,
-        UndoRedoTo
-    };
-
-    struct DirtyState
-    {
-        struct Gizmos
-        {
-            struct Gizmo
-            {
-                std::vector<size_t> modified_timestamps;
-            };
-
-            bool current{ false };
-            std::map<std::string, Gizmo> used;
-
-            void add_used(const UndoRedo::Snapshot& snapshot);
-            void remove_obsolete_used(const Slic3r::UndoRedo::Stack& main_stack);
-#if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
-            bool any_used_modified() const;
-#endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
-            bool is_used_and_modified(const UndoRedo::Snapshot& snapshot) const;
-            void reset();
-        };
-
-        bool plater{ false };
-        bool presets{ false };
-        Gizmos gizmos;
-
-        bool is_dirty() const { return plater || presets || gizmos.current; }
-        void reset() {
-            plater = false;
-            presets = false;
-            gizmos.current = false;
-        }
-    };
-
-private:
-    struct LastSaveTimestamps
-    {
-        size_t main{ 0 };
-        size_t gizmo{ 0 };
-
-        void reset() {
-            main = 0;
-            gizmo = 0;
-        }
-    };
-
-    DirtyState m_state;
-    LastSaveTimestamps m_last_save;
-
-    // keeps track of initial selected presets
-    std::array<std::string, Preset::TYPE_COUNT> m_initial_presets;
-
-public:
-    bool is_dirty() const { return m_state.is_dirty(); }
-    void update_from_undo_redo_stack(UpdateType type);
+public:    
+    void update_from_undo_redo_stack(bool dirty);
     void update_from_presets();
     void reset_after_save();
     void reset_initial_presets();
+
+    bool is_dirty() const { return m_plater_dirty || m_presets_dirty; }
+
 #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
     void render_debug_window() const;
 #endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
 
 private:
-    void update_from_undo_redo_main_stack(UpdateType type, const Slic3r::UndoRedo::Stack& stack);
-    void update_from_undo_redo_gizmo_stack(UpdateType type, const Slic3r::UndoRedo::Stack& stack);
+    // Does the Undo / Redo stack indicate the project is dirty?
+    bool                                        m_plater_dirty { false };
+    // Do the presets indicate the project is dirty?
+    bool                                        m_presets_dirty { false };
+    // Keeps track of preset names selected at the time of last project save.
+    std::array<std::string, Preset::TYPE_COUNT> m_initial_presets;
 };
 
 } // namespace GUI
 } // namespace Slic3r
 
 #endif // slic3r_ProjectDirtyStateManager_hpp_
-
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index 593d8241d..5fb8b0132 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -201,9 +201,7 @@ namespace search_for_drives_internal
 				struct stat buf;
 				stat(path.c_str(), &buf);
 				uid_t uid = buf.st_uid;
-				std::string username(std::getenv("USER"));
-				struct passwd *pw = getpwuid(uid);
-				if (pw != 0 && pw->pw_name == username)
+				if (getuid() == uid)
 					out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
 			}
 		}
@@ -245,7 +243,7 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons
 		search_for_drives_internal::search_path("/media/*", "/media", current_drives);
 
 		//search_path("/Volumes/*", "/Volumes");
-	    std::string path(std::getenv("USER"));
+		std::string path = wxGetUserId().ToUTF8().data();
 		std::string pp(path);
 
 		//search /media/USERNAME/* folder
diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp
index 83d60ac6e..1e37dc372 100644
--- a/src/slic3r/GUI/Search.cpp
+++ b/src/slic3r/GUI/Search.cpp
@@ -24,6 +24,8 @@ using boost::optional;
 
 namespace Slic3r {
 
+wxDEFINE_EVENT(wxCUSTOMEVT_JUMP_TO_OPTION, wxCommandEvent);
+
 using GUI::from_u8;
 using GUI::into_u8;
 
@@ -289,13 +291,10 @@ bool OptionsSearcher::search(const std::string& search, bool force/* = false*/)
 
 OptionsSearcher::OptionsSearcher()
 {
-    search_dialog = new SearchDialog(this);
 }
 
 OptionsSearcher::~OptionsSearcher()
 {
-    if (search_dialog)
-        search_dialog->Destroy();
 }
 
 void OptionsSearcher::init(std::vector<InputInfo> input_values)
@@ -386,6 +385,22 @@ Option OptionsSearcher::get_option(const std::string& opt_key, const wxString& l
     return create_option(opt_key, label, type, gc);
 }
 
+void OptionsSearcher::show_dialog()
+{
+    if (!search_dialog) {
+        search_dialog = new SearchDialog(this);
+
+        auto parent = search_dialog->GetParent();
+        wxPoint pos = parent->ClientToScreen(wxPoint(0, 0));
+        pos.x += em_unit(parent) * 40;
+        pos.y += em_unit(parent) * 4;
+
+        search_dialog->SetPosition(pos);
+    }
+
+    search_dialog->Popup();
+}
+
 void OptionsSearcher::add_key(const std::string& opt_key, Preset::Type type, const wxString& group, const wxString& category)
 {
     groups_and_categories[get_key(opt_key, type)] = GroupAndCategory{group, category};
@@ -405,7 +420,7 @@ static const std::map<const char, int> icon_idxs = {
 };
 
 SearchDialog::SearchDialog(OptionsSearcher* searcher)
-    : GUI::DPIDialog(NULL, wxID_ANY, _L("Search"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
+    : GUI::DPIDialog(GUI::wxGetApp().tab_panel(), wxID_ANY, _L("Search"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
     searcher(searcher)
 {
     SetFont(GUI::wxGetApp().normal_font());
@@ -506,7 +521,8 @@ void SearchDialog::Popup(wxPoint position /*= wxDefaultPosition*/)
     if (check_english)
         check_english->SetValue(params.english);
 
-    this->SetPosition(position);
+    if (position != wxDefaultPosition)
+        this->SetPosition(position);
     this->ShowModal();
 }
 
@@ -514,9 +530,16 @@ void SearchDialog::ProcessSelection(wxDataViewItem selection)
 {
     if (!selection.IsOk())
         return;
-
-    GUI::wxGetApp().sidebar().jump_to_option(search_list_model->GetRow(selection));
     this->EndModal(wxID_CLOSE);
+
+    // If call GUI::wxGetApp().sidebar.jump_to_option() directly from here,
+    // then mainframe will not have focus and found option will not be "active" (have cursor) as a result
+    // SearchDialog have to be closed and have to lose a focus
+    // and only after that jump_to_option() function can be called
+    // So, post event to plater: 
+    wxCommandEvent event(wxCUSTOMEVT_JUMP_TO_OPTION);
+    event.SetInt(search_list_model->GetRow(selection));
+    wxPostEvent(GUI::wxGetApp().plater(), event);
 }
 
 void SearchDialog::OnInputText(wxCommandEvent&)
diff --git a/src/slic3r/GUI/Search.hpp b/src/slic3r/GUI/Search.hpp
index a942a89f8..19de58f96 100644
--- a/src/slic3r/GUI/Search.hpp
+++ b/src/slic3r/GUI/Search.hpp
@@ -22,6 +22,8 @@
 
 namespace Slic3r {
 
+wxDECLARE_EVENT(wxCUSTOMEVT_JUMP_TO_OPTION, wxCommandEvent);
+
 namespace Search{
 
 class SearchDialog;
@@ -134,6 +136,8 @@ public:
             return o1.key < o2.key; });
     }
     void sort_options_by_label() { sort_options(); }
+
+    void show_dialog();
 };
 
 
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index 92c758d4b..3ab9b7bdc 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -10,6 +10,7 @@
 #include "Gizmos/GLGizmoBase.hpp"
 #include "Camera.hpp"
 #include "Plater.hpp"
+#include "slic3r/Utils/UndoRedo.hpp"
 
 #include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/Model.hpp"
@@ -162,7 +163,7 @@ void Selection::add(unsigned int volume_idx, bool as_single_selection, bool chec
     needs_reset |= is_any_modifier() && !volume->is_modifier;
 
     if (!already_contained || needs_reset) {
-        wxGetApp().plater()->take_snapshot(_L("Selection-Add"));
+        wxGetApp().plater()->take_snapshot(_L("Selection-Add"), UndoRedo::SnapshotType::Selection);
 
         if (needs_reset)
             clear();
@@ -203,7 +204,7 @@ void Selection::remove(unsigned int volume_idx)
     if (!contains_volume(volume_idx))
         return;
 
-    wxGetApp().plater()->take_snapshot(_L("Selection-Remove"));
+    wxGetApp().plater()->take_snapshot(_L("Selection-Remove"), UndoRedo::SnapshotType::Selection);
 
     GLVolume* volume = (*m_volumes)[volume_idx];
 
@@ -235,7 +236,7 @@ void Selection::add_object(unsigned int object_idx, bool as_single_selection)
         (as_single_selection && matches(volume_idxs)))
         return;
 
-    wxGetApp().plater()->take_snapshot(_L("Selection-Add Object"));
+    wxGetApp().plater()->take_snapshot(_L("Selection-Add Object"), UndoRedo::SnapshotType::Selection);
 
     // resets the current list if needed
     if (as_single_selection)
@@ -254,7 +255,7 @@ void Selection::remove_object(unsigned int object_idx)
     if (!m_valid)
         return;
 
-    wxGetApp().plater()->take_snapshot(_L("Selection-Remove Object"));
+    wxGetApp().plater()->take_snapshot(_L("Selection-Remove Object"), UndoRedo::SnapshotType::Selection);
 
     do_remove_object(object_idx);
 
@@ -272,7 +273,7 @@ void Selection::add_instance(unsigned int object_idx, unsigned int instance_idx,
         (as_single_selection && matches(volume_idxs)))
         return;
 
-    wxGetApp().plater()->take_snapshot(_L("Selection-Add Instance"));
+    wxGetApp().plater()->take_snapshot(_L("Selection-Add Instance"), UndoRedo::SnapshotType::Selection);
 
     // resets the current list if needed
     if (as_single_selection)
@@ -291,7 +292,7 @@ void Selection::remove_instance(unsigned int object_idx, unsigned int instance_i
     if (!m_valid)
         return;
 
-    wxGetApp().plater()->take_snapshot(_L("Selection-Remove Instance"));
+    wxGetApp().plater()->take_snapshot(_L("Selection-Remove Instance"), UndoRedo::SnapshotType::Selection);
 
     do_remove_instance(object_idx, instance_idx);
 
@@ -388,7 +389,7 @@ void Selection::add_all()
     if ((unsigned int)m_list.size() == count)
         return;
     
-    wxGetApp().plater()->take_snapshot(_(L("Selection-Add All")));
+    wxGetApp().plater()->take_snapshot(_(L("Selection-Add All")), UndoRedo::SnapshotType::Selection);
 
     m_mode = Instance;
     clear();
@@ -413,7 +414,7 @@ void Selection::remove_all()
 // Not taking the snapshot with non-empty Redo stack will likely be more confusing than losing the Redo stack.
 // Let's wait for user feedback.
 //    if (!wxGetApp().plater()->can_redo())
-        wxGetApp().plater()->take_snapshot(_L("Selection-Remove All"));
+        wxGetApp().plater()->take_snapshot(_L("Selection-Remove All"), UndoRedo::SnapshotType::Selection);
 
     m_mode = Instance;
     clear();
@@ -620,24 +621,54 @@ const GLVolume* Selection::get_volume(unsigned int volume_idx) const
 
 const BoundingBoxf3& Selection::get_bounding_box() const
 {
-    if (m_bounding_box_dirty)
-        calc_bounding_box();
-
-    return m_bounding_box;
+    if (!m_bounding_box.has_value()) {
+        std::optional<BoundingBoxf3>* bbox = const_cast<std::optional<BoundingBoxf3>*>(&m_bounding_box);
+        *bbox = BoundingBoxf3();
+        if (m_valid) {
+            for (unsigned int i : m_list) {
+                (*bbox)->merge((*m_volumes)[i]->transformed_convex_hull_bounding_box());
+            }
+        }
+    }
+    return *m_bounding_box;
 }
 
 const BoundingBoxf3& Selection::get_unscaled_instance_bounding_box() const
 {
-    if (m_unscaled_instance_bounding_box_dirty)
-        calc_unscaled_instance_bounding_box();
-    return m_unscaled_instance_bounding_box;
+    if (!m_unscaled_instance_bounding_box.has_value()) {
+        std::optional<BoundingBoxf3>* bbox = const_cast<std::optional<BoundingBoxf3>*>(&m_unscaled_instance_bounding_box);
+        *bbox = BoundingBoxf3();
+        if (m_valid) {
+            for (unsigned int i : m_list) {
+                const GLVolume& volume = *(*m_volumes)[i];
+                if (volume.is_modifier)
+                    continue;
+                Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, true, false) * volume.get_volume_transformation().get_matrix();
+                trafo.translation().z() += volume.get_sla_shift_z();
+                (*bbox)->merge(volume.transformed_convex_hull_bounding_box(trafo));
+            }
+        }
+    }
+    return *m_unscaled_instance_bounding_box;
 }
 
 const BoundingBoxf3& Selection::get_scaled_instance_bounding_box() const
 {
-    if (m_scaled_instance_bounding_box_dirty)
-        calc_scaled_instance_bounding_box();
-    return m_scaled_instance_bounding_box;
+    if (!m_scaled_instance_bounding_box.has_value()) {
+        std::optional<BoundingBoxf3>* bbox = const_cast<std::optional<BoundingBoxf3>*>(&m_scaled_instance_bounding_box);
+        *bbox = BoundingBoxf3();
+        if (m_valid) {
+            for (unsigned int i : m_list) {
+                const GLVolume& volume = *(*m_volumes)[i];
+                if (volume.is_modifier)
+                    continue;
+                Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, false, false) * volume.get_volume_transformation().get_matrix();
+                trafo.translation().z() += volume.get_sla_shift_z();
+                (*bbox)->merge(volume.transformed_convex_hull_bounding_box(trafo));
+            }
+        }
+    }
+    return *m_scaled_instance_bounding_box;
 }
 
 void Selection::start_dragging()
@@ -823,10 +854,10 @@ void Selection::flattening_rotate(const Vec3d& normal)
     }
 
 #if !DISABLE_INSTANCES_SYNCH
-    // we want to synchronize z-rotation as well, otherwise the flattening behaves funny
-    // when applied on one of several identical instances
+    // Apply the same transformation also to other instances,
+    // but respect their possibly diffrent z-rotation.
     if (m_mode == Instance)
-        synchronize_unselected_instances(SYNC_ROTATION_FULL);
+        synchronize_unselected_instances(SYNC_ROTATION_GENERAL);
 #endif // !DISABLE_INSTANCES_SYNCH
 
     this->set_bounding_boxes_dirty();
@@ -1692,52 +1723,6 @@ void Selection::do_remove_object(unsigned int object_idx)
     }
 }
 
-void Selection::calc_bounding_box() const
-{
-    BoundingBoxf3* bounding_box = const_cast<BoundingBoxf3*>(&m_bounding_box);
-    *bounding_box = BoundingBoxf3();
-    if (m_valid) {
-        for (unsigned int i : m_list) {
-            bounding_box->merge((*m_volumes)[i]->transformed_convex_hull_bounding_box());
-        }
-    }
-    *const_cast<bool*>(&m_bounding_box_dirty) = false;
-}
-
-void Selection::calc_unscaled_instance_bounding_box() const
-{
-    BoundingBoxf3* unscaled_instance_bounding_box = const_cast<BoundingBoxf3*>(&m_unscaled_instance_bounding_box);
-    *unscaled_instance_bounding_box = BoundingBoxf3();
-    if (m_valid) {
-        for (unsigned int i : m_list) {
-            const GLVolume& volume = *(*m_volumes)[i];
-            if (volume.is_modifier)
-                continue;
-            Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, true, false) * volume.get_volume_transformation().get_matrix();
-            trafo.translation().z() += volume.get_sla_shift_z();
-            unscaled_instance_bounding_box->merge(volume.transformed_convex_hull_bounding_box(trafo));
-        }
-    }
-    *const_cast<bool*>(&m_unscaled_instance_bounding_box_dirty) = false;
-}
-
-void Selection::calc_scaled_instance_bounding_box() const
-{
-    BoundingBoxf3* scaled_instance_bounding_box = const_cast<BoundingBoxf3*>(&m_scaled_instance_bounding_box);
-    *scaled_instance_bounding_box = BoundingBoxf3();
-    if (m_valid) {
-        for (unsigned int i : m_list) {
-            const GLVolume& volume = *(*m_volumes)[i];
-            if (volume.is_modifier)
-                continue;
-            Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, false, false) * volume.get_volume_transformation().get_matrix();
-            trafo.translation().z() += volume.get_sla_shift_z();
-            scaled_instance_bounding_box->merge(volume.transformed_convex_hull_bounding_box(trafo));
-        }
-    }
-    *const_cast<bool*>(&m_scaled_instance_bounding_box_dirty) = false;
-}
-
 void Selection::render_selected_volumes() const
 {
     float color[3] = { 1.0f, 1.0f, 1.0f };
@@ -2055,10 +2040,6 @@ void Selection::synchronize_unselected_instances(SyncRotationType sync_rotation_
                     v->set_instance_offset(Z, volume->get_instance_offset().z());
                 break;
             }
-            case SYNC_ROTATION_FULL:
-                // rotation comes from place on face -> force given z
-                v->set_instance_rotation({ rotation.x(), rotation.y(), rotation.z() });
-                break;
             case SYNC_ROTATION_GENERAL:
                 // generic rotation -> update instance z with the delta of the rotation.
                 const double z_diff = Geometry::rotation_diff_z(m_cache.volumes_data[i].get_instance_rotation(), m_cache.volumes_data[j].get_instance_rotation());
diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp
index b3304571f..dea507511 100644
--- a/src/slic3r/GUI/Selection.hpp
+++ b/src/slic3r/GUI/Selection.hpp
@@ -1,10 +1,12 @@
 #ifndef slic3r_GUI_Selection_hpp_
 #define slic3r_GUI_Selection_hpp_
 
-#include <set>
 #include "libslic3r/Geometry.hpp"
 #include "GLModel.hpp"
 
+#include <set>
+#include <optional>
+
 namespace Slic3r {
 
 class Shader;
@@ -203,14 +205,11 @@ private:
     IndicesList m_list;
     Cache m_cache;
     Clipboard m_clipboard;
-    BoundingBoxf3 m_bounding_box;
-    bool m_bounding_box_dirty;
+    std::optional<BoundingBoxf3> m_bounding_box;
     // Bounding box of a selection, with no instance scaling applied. This bounding box
     // is useful for absolute scaling of tilted objects in world coordinate space.
-    BoundingBoxf3 m_unscaled_instance_bounding_box;
-    bool m_unscaled_instance_bounding_box_dirty;
-    BoundingBoxf3 m_scaled_instance_bounding_box;
-    bool m_scaled_instance_bounding_box_dirty;
+    std::optional<BoundingBoxf3> m_unscaled_instance_bounding_box;
+    std::optional<BoundingBoxf3> m_scaled_instance_bounding_box;
 
 #if ENABLE_RENDER_SELECTION_CENTER
     GLModel m_vbo_sphere;
@@ -359,10 +358,7 @@ private:
     void do_remove_volume(unsigned int volume_idx);
     void do_remove_instance(unsigned int object_idx, unsigned int instance_idx);
     void do_remove_object(unsigned int object_idx);
-    void calc_bounding_box() const;
-    void calc_unscaled_instance_bounding_box() const;
-    void calc_scaled_instance_bounding_box() const;
-    void set_bounding_boxes_dirty() { m_bounding_box_dirty = true; m_unscaled_instance_bounding_box_dirty = true; m_scaled_instance_bounding_box_dirty = true; }
+    void set_bounding_boxes_dirty() { m_bounding_box.reset(); m_unscaled_instance_bounding_box.reset(); m_scaled_instance_bounding_box.reset(); }
     void render_selected_volumes() const;
     void render_synchronized_volumes() const;
     void render_bounding_box(const BoundingBoxf3& box, float* color) const;
@@ -375,10 +371,8 @@ public:
     enum SyncRotationType {
         // Do not synchronize rotation. Either not rotating at all, or rotating by world Z axis.
         SYNC_ROTATION_NONE = 0,
-        // Synchronize fully. Used from "place on bed" feature.
-        SYNC_ROTATION_FULL = 1,
         // Synchronize after rotation by an axis not parallel with Z.
-        SYNC_ROTATION_GENERAL = 2,
+        SYNC_ROTATION_GENERAL = 1,
     };
     void synchronize_unselected_instances(SyncRotationType sync_rotation_type);
     void synchronize_unselected_volumes();
diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp
new file mode 100644
index 000000000..db6ebad57
--- /dev/null
+++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp
@@ -0,0 +1,647 @@
+#include "SendSystemInfoDialog.hpp"
+
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Platform.hpp"
+#include "libslic3r/Utils.hpp"
+
+#include "slic3r/GUI/format.hpp"
+#include "slic3r/Utils/Http.hpp"
+
+#include "GUI_App.hpp"
+#include "GUI_Utils.hpp"
+#include "I18N.hpp"
+#include "MainFrame.hpp"
+#include "MsgDialog.hpp"
+#include "OpenGLManager.hpp"
+
+#include <boost/algorithm/hex.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/trim_all.hpp>
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/uuid/detail/md5.hpp>
+
+#include "GL/glew.h"
+
+#include <wx/display.h>
+#include <wx/htmllbox.h>
+#include <wx/stattext.h>
+#include <wx/timer.h>
+#include <wx/utils.h>
+
+#include <atomic>
+#include <thread>
+
+#ifdef _WIN32
+    #include <windows.h>
+    #include <Iphlpapi.h>
+    #pragma comment(lib, "iphlpapi.lib")
+#elif __APPLE__
+#import <IOKit/IOKitLib.h>
+#endif
+
+namespace Slic3r {
+namespace GUI {
+
+
+
+// Declaration of a free function defined in OpenGLManager.cpp:
+std::string gl_get_string_safe(GLenum param, const std::string& default_value);
+
+
+// A dialog with the information text and buttons send/dont send/ask later.
+class SendSystemInfoDialog : public DPIDialog
+{
+    enum {
+        MIN_WIDTH = 80,
+        MIN_HEIGHT = 50
+    };
+
+public:
+    SendSystemInfoDialog(wxWindow* parent);
+
+private:
+    bool send_info();
+    const std::string m_system_info_json;
+    wxButton* m_btn_send;
+    wxButton* m_btn_dont_send;
+    wxButton* m_btn_ask_later;
+
+    void on_dpi_changed(const wxRect&) override;
+};
+
+
+
+// A dialog to show when the upload is in progress (with a Cancel button).
+class SendSystemInfoProgressDialog : public wxDialog
+{
+public:
+    SendSystemInfoProgressDialog(wxWindow* parent, const wxString& message)
+        : wxDialog(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCAPTION)
+    {
+        auto* text = new wxStaticText(this, wxID_ANY, message, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
+        auto* btn = new wxButton(this, wxID_CANCEL, _L("Cancel"));
+        auto* vsizer = new wxBoxSizer(wxVERTICAL);
+        auto *top_sizer = new wxBoxSizer(wxVERTICAL);
+        vsizer->Add(text, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL);
+        vsizer->AddSpacer(5);
+        vsizer->Add(btn, 0, wxALIGN_CENTER_HORIZONTAL);
+        top_sizer->Add(vsizer, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT | wxBOTTOM, 10);
+        SetSizer(top_sizer);
+        #ifdef _WIN32
+            wxGetApp().UpdateDlgDarkUI(this);
+        #endif
+    }
+};
+
+
+
+// A dialog with multiline read-only text control to show the JSON.
+class ShowJsonDialog : public wxDialog
+{
+public:
+    ShowJsonDialog(wxWindow* parent, const wxString& json, const wxSize& size)
+        : wxDialog(parent, wxID_ANY, _L("Data to send"), wxDefaultPosition, size, wxCAPTION|wxRESIZE_BORDER)
+    {
+        auto* text = new wxTextCtrl(this, wxID_ANY, json,
+                                    wxDefaultPosition, wxDefaultSize,
+                                    wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
+        text->SetFont(wxGetApp().code_font());
+        text->ShowPosition(0);
+
+        auto* btn = new wxButton(this, wxID_CANCEL, _L("Close"));
+        auto* vsizer = new wxBoxSizer(wxVERTICAL);
+        auto *top_sizer = new wxBoxSizer(wxVERTICAL);
+        vsizer->Add(text, 1, wxEXPAND);
+        vsizer->AddSpacer(5);
+        vsizer->Add(btn, 0, wxALIGN_CENTER_HORIZONTAL);
+        top_sizer->Add(vsizer, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT | wxBOTTOM, 10);
+        SetSizer(top_sizer);
+        #ifdef _WIN32
+            wxGetApp().UpdateDlgDarkUI(this);
+        #endif
+    }
+};
+
+
+
+// Last version where the info was sent / dialog dismissed is saved in appconfig.
+// Only show the dialog when this info is not found (e.g. fresh install) or when
+// current version is newer. Only major and minor versions are compared.
+static bool should_dialog_be_shown()
+{
+    return false;
+
+    std::string last_sent_version = wxGetApp().app_config->get("version_system_info_sent");
+    Semver semver_current(SLIC3R_VERSION);
+    Semver semver_last_sent;
+    if (! last_sent_version.empty())
+        semver_last_sent = Semver(last_sent_version);
+
+    if (semver_current.prerelease() && std::string(semver_current.prerelease()) == "alpha")
+        return false; // Don't show in alphas.
+
+    // Show the dialog if current > last, but they differ in more than just patch.
+    return ((semver_current.maj() > semver_last_sent.maj())
+        || (semver_current.maj() == semver_last_sent.maj() && semver_current.min() > semver_last_sent.min() ));
+}
+
+
+
+// Following function saves current PrusaSlicer version into app config.
+// It will be later used to decide whether to open the dialog or not.
+static void save_version()
+{
+    wxGetApp().app_config->set("version_system_info_sent", std::string(SLIC3R_VERSION));
+}
+
+
+
+#ifdef _WIN32
+static std::map<std::string, std::string> get_cpu_info_from_registry()
+{
+    std::map<std::string, std::string> out;
+
+    int idx = -1;
+    constexpr DWORD bufsize_ = 200;
+    DWORD bufsize = bufsize_;
+    char buf[bufsize_] = "";
+    const std::string reg_dir = "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\";
+    std::string reg_path = reg_dir;
+
+    // Look into that reg dir and possibly into subdirs called 0, 1, 2, etc.
+    // If the latter, count them.
+
+    while (true) {
+        if (RegGetValueA(HKEY_LOCAL_MACHINE, reg_path.c_str(), "ProcessorNameString",
+            RRF_RT_REG_SZ, NULL, &buf, &bufsize) == ERROR_SUCCESS) {
+            out["Model"] = buf;
+            out["Cores"] = std::to_string(std::max(1, idx + 1));
+            if (RegGetValueA(HKEY_LOCAL_MACHINE, reg_path.c_str(),
+                "VendorIdentifier", RRF_RT_REG_SZ, NULL, &buf, &bufsize) == ERROR_SUCCESS)
+                out["Vendor"] = buf;
+        }
+        else {
+            if (idx >= 0)
+                break;
+        }
+        ++idx;
+        reg_path = reg_dir + std::to_string(idx) + "\\";
+        bufsize = bufsize_;
+    }
+    return out;
+}
+#else // Apple, Linux, BSD
+static std::map<std::string, std::string> parse_lscpu_etc(const std::string& name, char delimiter)
+{
+    std::map<std::string, std::string> out;
+    constexpr size_t max_len = 100;
+    char cline[max_len] = "";
+    FILE* fp = popen(name.data(), "r");
+    if (fp != NULL) {
+        while (fgets(cline, max_len, fp) != NULL) {
+            std::string line(cline);
+            line.erase(std::remove_if(line.begin(), line.end(),
+                [](char c) { return c == '\"' || c == '\r' || c == '\n'; }),
+                line.end());
+            size_t pos = line.find(delimiter);
+            if (pos < line.size() - 1) {
+                std::string key = line.substr(0, pos);
+                std::string value = line.substr(pos + 1);
+                boost::trim_all(key); // remove leading and trailing spaces
+                boost::trim_all(value);
+                out[key] = value;
+            }
+        }
+        pclose(fp);
+    }
+    return out;
+}
+#endif
+
+
+
+static std::string get_unique_id()
+{
+    std::vector<unsigned char> unique;
+
+#ifdef _WIN32
+    // On Windows, get the MAC address of a network adaptor (preferably Ethernet
+    // or IEEE 802.11 wireless
+
+    DWORD dwBufLen = sizeof(IP_ADAPTER_INFO);
+    PIP_ADAPTER_INFO AdapterInfo = (PIP_ADAPTER_INFO)malloc(dwBufLen);
+
+    if (GetAdaptersInfo(AdapterInfo, &dwBufLen) == ERROR_BUFFER_OVERFLOW) {
+        free(AdapterInfo);
+        AdapterInfo = (IP_ADAPTER_INFO*)malloc(dwBufLen);
+    }    
+    if (GetAdaptersInfo(AdapterInfo, &dwBufLen) == NO_ERROR) {
+        const IP_ADAPTER_INFO* pAdapterInfo = AdapterInfo;
+        std::vector<std::vector<unsigned char>> macs;
+        bool ethernet_seen = false;
+        while (pAdapterInfo) {
+            macs.emplace_back();
+            for (unsigned char i = 0; i < pAdapterInfo->AddressLength; ++i)
+                macs.back().emplace_back(pAdapterInfo->Address[i]);
+            // Prefer Ethernet and IEEE 802.11 wireless
+            if (! ethernet_seen) {
+                if ((pAdapterInfo->Type == MIB_IF_TYPE_ETHERNET && (ethernet_seen = true))
+                 ||  pAdapterInfo->Type == IF_TYPE_IEEE80211)
+                    std::swap(macs.front(), macs.back());
+            }
+            pAdapterInfo = pAdapterInfo->Next;
+        }
+        if (! macs.empty())
+            unique = macs.front();
+    }
+    free(AdapterInfo);
+#elif __APPLE__
+    constexpr int buf_size = 100;
+    char buf[buf_size] = "";
+    memset(&buf, 0, sizeof(buf));
+    io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/");
+    CFStringRef uuidCf = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
+    IOObjectRelease(ioRegistryRoot);
+    CFStringGetCString(uuidCf, buf, buf_size, kCFStringEncodingMacRoman);
+    CFRelease(uuidCf);
+    // Now convert the string to std::vector<unsigned char>.
+    for (char* c = buf; *c != 0; ++c)
+        unique.emplace_back((unsigned char)(*c));
+#else // Linux/BSD
+    constexpr size_t max_len = 100;
+    char cline[max_len] = "";
+    FILE* fp = popen("cat /etc/machine-id", "r");
+    if (fp != NULL) {
+        // Maybe the only way to silence -Wunused-result on gcc...
+        // cline is simply not modified on failure, who cares.
+        [[maybe_unused]]auto dummy = fgets(cline, max_len, fp);
+        pclose(fp);
+    }
+    // Now convert the string to std::vector<unsigned char>.
+    for (char* c = cline; *c != 0; ++c)
+        unique.emplace_back((unsigned char)(*c));
+#endif
+
+    // In case that we did not manage to get the unique info, just return an empty
+    // string, so it is easily detectable and not masked by the hashing.
+    if (unique.empty())
+        return "";
+
+    // We should have a unique vector<unsigned char>. Append a long prime to be
+    // absolutely safe against unhashing.
+    uint64_t prime = 1171432692373;
+    size_t beg = unique.size();
+    unique.resize(beg + 8);
+    memcpy(&unique[beg], &prime, 8);
+
+    // Compute an MD5 hash and convert to std::string.
+    using boost::uuids::detail::md5;
+    md5 hash;
+    md5::digest_type digest;
+    hash.process_bytes(unique.data(), unique.size());
+    hash.get_digest(digest);
+    const unsigned char* charDigest = reinterpret_cast<const unsigned char*>(&digest);
+    std::string result;
+    boost::algorithm::hex(charDigest, charDigest + sizeof(md5::digest_type), std::back_inserter(result));
+    return result;
+}
+
+
+// Following function generates one string that will be shown in the preview
+// and later sent if confirmed by the user.
+static std::string generate_system_info_json()
+{
+    // Calculate hash of username so it is possible to identify duplicates.
+    // The result is mod 10000 so most of the information is lost and it is
+    // not possible to unhash the username. It is more than enough to help
+    // identify duplicate entries.
+    std::string unique_id = get_unique_id();
+
+    // Get system language.
+    std::string sys_language = "Unknown";
+    const wxLanguage lang_system = wxLanguage(wxLocale::GetSystemLanguage());
+    if (lang_system != wxLANGUAGE_UNKNOWN)
+        sys_language = wxLocale::GetLanguageInfo(lang_system)->CanonicalName.ToUTF8().data();
+
+    // Build a property tree with all the information.
+    namespace pt = boost::property_tree;
+
+    pt::ptree data_node;
+    data_node.put("PrusaSlicerVersion", SLIC3R_VERSION);
+    data_node.put("BuildID", SLIC3R_BUILD_ID);
+    data_node.put("UniqueID", unique_id);
+    data_node.put("Platform", platform_to_string(platform()));
+    data_node.put("PlatformFlavor", platform_flavor_to_string(platform_flavor()));
+    data_node.put("OSDescription", wxPlatformInfo::Get().GetOperatingSystemDescription().ToUTF8().data());
+#ifdef __linux__
+    std::string distro_id = wxGetLinuxDistributionInfo().Id.ToUTF8().data(); // uses lsb-release
+    std::string distro_ver = wxGetLinuxDistributionInfo().Release.ToUTF8().data();
+    if (distro_id.empty()) { // lsb-release probably not available
+        std::map<std::string, std::string> dist_info = parse_lscpu_etc("cat /etc/*release", '=');
+        distro_id = dist_info["ID"];
+        distro_ver = dist_info["VERSION_ID"];
+    }
+    data_node.put("Linux_DistroID", distro_id);
+    data_node.put("Linux_DistroVer", distro_ver);
+    data_node.put("Linux_Wayland", wxGetEnv("WAYLAND_DISPLAY", nullptr));
+#endif
+    data_node.put("wxWidgets", wxVERSION_NUM_DOT_STRING);
+#ifdef __WXGTK__
+    data_node.put("GTK",
+    #if defined(__WXGTK2__)
+        2
+    #elif defined(__WXGTK3__)
+        3
+    #elif defined(__WXGTK4__)
+        4
+    #elif defined(__WXGTK5__)
+        5
+    #else
+        "Unknown"
+    #endif
+    );
+#endif // __WXGTK__
+    data_node.put("SystemLanguage", sys_language);
+    data_node.put("TranslationLanguage: ", wxGetApp().app_config->get("translation_language"));
+
+    pt::ptree hw_node;
+    hw_node.put("ArchName", wxPlatformInfo::Get().GetArchName());
+    hw_node.put("RAM_MB", size_t(Slic3r::total_physical_memory()/1000000));
+
+    // Now get some CPU info:
+    pt::ptree cpu_node;
+#ifdef _WIN32
+    std::map<std::string, std::string> cpu_info = get_cpu_info_from_registry();
+    cpu_node.put("Cores",  cpu_info["Cores"]);
+    cpu_node.put("Model",  cpu_info["Model"]);
+    cpu_node.put("Vendor", cpu_info["Vendor"]);
+#elif __APPLE__
+     std::map<std::string, std::string> sysctl = parse_lscpu_etc("sysctl -a", ':');
+     cpu_node.put("Cores",  sysctl["hw.ncpu"]);
+     cpu_node.put("Model",  sysctl["machdep.cpu.brand_string"]);
+     cpu_node.put("Vendor", sysctl["machdep.cpu.vendor"]);
+#else // linux/BSD
+    std::map<std::string, std::string> lscpu = parse_lscpu_etc("lscpu", ':');
+    cpu_node.put("Arch",   lscpu["Architecture"]);
+    cpu_node.put("Cores",  lscpu["CPU(s)"]);
+    cpu_node.put("Model",  lscpu["Model name"]);
+    cpu_node.put("Vendor", lscpu["Vendor ID"]);
+#endif
+    hw_node.add_child("CPU", cpu_node);
+
+    pt::ptree monitors_node;
+    for (int i=0; i<int(wxDisplay::GetCount()); ++i) {
+        wxDisplay display(i);
+        double scaling = -1.;
+        #if wxCHECK_VERSION(3, 1, 2) // we have wxDisplag::GetPPI
+            int std_ppi = 96;
+            #ifdef __WXOSX__ // see impl of wxDisplay::GetStdPPIValue from 3.1.5
+                std_ppi = 72;
+            #endif
+            scaling = double(display.GetPPI().GetWidth()) / std_ppi;
+        #endif
+        pt::ptree monitor_node; // Create an unnamed node containing the value
+        monitor_node.put("width", display.GetGeometry().GetWidth());
+        monitor_node.put("height", display.GetGeometry().GetHeight());
+        std::stringstream ss;
+        ss << std::setprecision(3) << scaling;
+        monitor_node.put("scaling", ss.str() );
+        monitors_node.push_back(std::make_pair("", monitor_node));
+    }
+    hw_node.add_child("Monitors", monitors_node);
+    data_node.add_child("Hardware", hw_node);
+
+    pt::ptree opengl_node;
+    opengl_node.put("Version", OpenGLManager::get_gl_info().get_version());
+    opengl_node.put("GLSLVersion", OpenGLManager::get_gl_info().get_glsl_version());
+    opengl_node.put("Vendor", OpenGLManager::get_gl_info().get_vendor());
+    opengl_node.put("Renderer", OpenGLManager::get_gl_info().get_renderer());
+    // Generate list of OpenGL extensions:
+    std::string extensions_str = gl_get_string_safe(GL_EXTENSIONS, "");
+    std::vector<std::string> extensions_list;
+    boost::split(extensions_list, extensions_str, boost::is_any_of(" "), boost::token_compress_off);
+    std::sort(extensions_list.begin(), extensions_list.end());
+    pt::ptree extensions_node;
+    for (const std::string& s : extensions_list) {
+        if (s.empty())
+            continue;
+        pt::ptree ext_node; // Create an unnamed node containing the value
+        ext_node.put("", s);
+        extensions_node.push_back(std::make_pair("", ext_node)); // Add this node to the list.
+    }
+    opengl_node.add_child("Extensions", extensions_node);
+    data_node.add_child("OpenGL", opengl_node);
+
+    pt::ptree root;
+    root.add_child("data", data_node);
+
+    // Serialize the tree into JSON and return it.
+    std::stringstream ss;
+    pt::write_json(ss, root);
+    return ss.str();
+
+    // FURTHER THINGS TO CONSIDER:
+    //std::cout << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << std::endl;          // Unix
+    // ? CPU, GPU, UNKNOWN ?
+    // printers? will they be installed already?
+}
+
+
+
+SendSystemInfoDialog::SendSystemInfoDialog(wxWindow* parent)
+    : m_system_info_json{generate_system_info_json()},
+    GUI::DPIDialog(parent, wxID_ANY, _L("Send system info"), wxDefaultPosition, wxDefaultSize,
+           wxDEFAULT_DIALOG_STYLE)
+{
+    // Get current PrusaSliver version info.
+    std::string app_name;
+    {
+        Semver semver(SLIC3R_VERSION);
+        bool is_alpha = std::string{semver.prerelease()}.find("alpha") != std::string::npos;
+        bool is_beta = std::string{semver.prerelease()}.find("beta") != std::string::npos;
+        app_name = std::string(SLIC3R_APP_NAME) + " " + std::to_string(semver.maj())
+                               + "." + std::to_string(semver.min()) + " "
+                               + (is_alpha ? "Alpha" : is_beta ? "Beta" : "");
+    }
+
+    // Get current source file name.
+    std::string filename(__FILE__);
+    size_t last_slash_idx = filename.find_last_of("/\\");
+    if (last_slash_idx != std::string::npos)
+        filename = filename.substr(last_slash_idx+1);
+
+    // Set dialog background color, fonts, etc.
+    SetFont(wxGetApp().normal_font());
+    wxColour bgr_clr = wxGetApp().get_window_default_clr();
+    SetBackgroundColour(bgr_clr);
+    const auto text_clr = wxGetApp().get_label_clr_default();
+    auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
+    auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
+
+
+    auto *topSizer = new wxBoxSizer(wxVERTICAL);
+    auto *vsizer = new wxBoxSizer(wxVERTICAL);
+
+    wxString text0 = GUI::format_wxstr(_L("This is the first time you are running %1%. We would like to "
+           "ask you to send some of your system information to us. This will only "
+           "happen once and we will not ask you to do this again (only after you "
+           "upgrade to the next version)."), app_name );
+    wxString text1 = _L("If we know your hardware, operating system, etc., it will greatly help us "
+        "in development and prioritization, because we will be able to focus our effort more efficiently "
+        "and spend time on features that are needed the most.");
+    wxString label2 = _L("Is it safe?");
+    wxString text2 = GUI::format_wxstr(
+        _L("We do not send any personal information nor anything that would allow us "
+           "to identify you later. To detect duplicate entries, a unique number derived "
+           "from your system is sent, but the source information cannot be reconstructed. "
+           "Apart from that, only general data about your OS, hardware and OpenGL "
+           "installation are sent. PrusaSlicer is open source, if you want to "
+           "inspect the code actually performing the communication, see %1%."),
+           std::string("<i>") + filename + "</i>");
+    wxString label3 = _L("Show verbatim data that will be sent");
+
+    auto* html_window = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
+    wxString html = GUI::format_wxstr(
+            "<html><body bgcolor=%1%><font color=%2%>"
+            "<table><tr><td>"
+            "<img src = \"" + resources_dir() + "/icons/PrusaSlicer_192px.png\" />"
+            "</td><td align=\"left\">"
+            + text0 + "<br / ><br / >"
+            + text1 + "<br /><br />"
+            "</td></tr></table>"
+            + "<b>" + label2 + "</b><br />"
+            + text2 + "<br /><br />"
+            + "<b><a href=\"show\">" + label3 + "</a></b><br />"
+            + "</font></body></html>", bgr_clr_str, text_clr_str);
+    html_window->SetPage(html);
+    html_window->Bind(wxEVT_HTML_LINK_CLICKED, [this](wxHtmlLinkEvent &evt) {
+                                                   ShowJsonDialog dlg(this, m_system_info_json, GetSize().Scale(0.9, 0.7));
+                                                   dlg.ShowModal();
+    });
+
+    vsizer->Add(html_window, 1, wxEXPAND);
+
+    m_btn_ask_later = new wxButton(this, wxID_ANY, _L("Ask me next time"));
+    m_btn_dont_send = new wxButton(this, wxID_ANY, _L("Do not send anything"));
+    m_btn_send = new wxButton(this, wxID_ANY, _L("Send system info"));
+
+    auto* hsizer = new wxBoxSizer(wxHORIZONTAL);
+    const int em = GUI::wxGetApp().em_unit();
+    hsizer->Add(m_btn_ask_later);
+    hsizer->AddSpacer(em);
+    hsizer->Add(m_btn_dont_send);
+    hsizer->AddSpacer(em);
+    hsizer->Add(m_btn_send);
+
+    vsizer->Add(hsizer, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 10);
+    topSizer->Add(vsizer, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10);
+
+    SetSizer(topSizer);
+    topSizer->SetSizeHints(this);
+
+
+#ifdef _WIN32
+    wxGetApp().UpdateDlgDarkUI(this);
+#endif
+
+    const auto size = GetSize();
+    SetSize(std::max(size.GetWidth(), MIN_WIDTH * em),
+            std::max(size.GetHeight(), MIN_HEIGHT * em));
+
+    m_btn_send->Bind(wxEVT_BUTTON, [this](const wxEvent&)
+                                    {
+                                        if (send_info()) {
+                                            save_version();
+                                            EndModal(0);
+                                        }
+                                    });
+    m_btn_dont_send->Bind(wxEVT_BUTTON, [this](const wxEvent&)
+                                         {
+                                             save_version();
+                                             EndModal(0);
+                                         });
+    m_btn_ask_later->Bind(wxEVT_BUTTON, [this](const wxEvent&) { EndModal(0); });
+}
+
+
+
+void SendSystemInfoDialog::on_dpi_changed(const wxRect&)
+{
+    const int& em = em_unit();
+    msw_buttons_rescale(this, em, { m_btn_send->GetId(),
+                                    m_btn_dont_send->GetId(),
+                                    m_btn_ask_later->GetId() });
+    SetMinSize(wxSize(MIN_WIDTH * em, MIN_HEIGHT * em));
+    Fit();
+    Refresh();
+}
+
+
+
+// This actually sends the info.
+bool SendSystemInfoDialog::send_info()
+{
+    std::atomic<int> job_done = false; // Flag to communicate between threads.
+    struct Result {
+        enum {
+            Success,
+            Cancelled,
+            Error
+        } value;
+        wxString str;
+    } result; // No synchronization needed, UI thread reads only after worker is joined.
+
+    auto send = [&job_done, &result](const std::string& data) {
+        const std::string url = "https://files.prusa3d.com/wp-json/v1/ps";
+        Http http = Http::post(url);
+        http.header("Content-Type", "application/json")
+            .set_post_body(data)
+            .on_complete([&result](std::string body, unsigned status) {
+                result = { Result::Success, _L("System info sent successfully. Thank you.") };
+            })
+            .on_error([&result](std::string body, std::string error, unsigned status) {
+                result = { Result::Error, GUI::format_wxstr(_L("Sending system info failed! Status: %1%"), status) };
+            })
+            .on_progress([&job_done, &result](Http::Progress, bool &cancel) {
+                if (job_done) // UI thread wants us to cancel.
+                    cancel = true;
+                if (cancel)
+                    result = { Result::Cancelled, _L("Sending system info was cancelled.") };
+            })
+            .perform_sync();
+        job_done = true; // So that the dialog knows we are done.
+    };
+
+    std::thread sending_thread(send, m_system_info_json);
+    SendSystemInfoProgressDialog dlg(this, _L("Sending system info..."));
+    wxTimer timer(&dlg); // Periodically check the status of the other thread, close dialog when done.
+    dlg.Bind(wxEVT_TIMER, [&dlg, &job_done](wxTimerEvent&){ if (job_done) dlg.EndModal(0); });
+    timer.Start(50);
+    dlg.ShowModal();
+    // The dialog is closed, either by user, or by the now terminated worker thread.
+    job_done = true;       // In case the user closed the dialog, let the other thread know
+    sending_thread.join(); // and wait until it terminates.
+
+    InfoDialog info_dlg(wxGetApp().mainframe, wxEmptyString, result.str);
+    info_dlg.ShowModal();
+    return result.value == Result::Success;
+}
+
+
+
+// The only function callable from outside this unit.
+void show_send_system_info_dialog_if_needed()
+{
+    if (wxGetApp().is_gcode_viewer() || ! should_dialog_be_shown())
+        return;
+
+    SendSystemInfoDialog dlg(wxGetApp().mainframe);
+    dlg.ShowModal();
+}
+
+
+
+
+
+} // namespace GUI
+} // namespace Slic3r
diff --git a/src/slic3r/GUI/SendSystemInfoDialog.hpp b/src/slic3r/GUI/SendSystemInfoDialog.hpp
new file mode 100644
index 000000000..dbc3ca978
--- /dev/null
+++ b/src/slic3r/GUI/SendSystemInfoDialog.hpp
@@ -0,0 +1,14 @@
+#ifndef slic3r_SendSystemInfoDialog_hpp_
+#define slic3r_SendSystemInfoDialog_hpp_
+
+namespace Slic3r {
+
+namespace GUI {
+
+void show_send_system_info_dialog_if_needed();
+
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif // slic3r_SendSystemInfoDialog_hpp_
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 5effa3599..8b3cd4cf8 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -501,6 +501,8 @@ void Tab::OnActivate()
         m_presets_choice->SetMinSize(ok_sz);
         m_presets_choice->SetSize(ok_sz);
         GetSizer()->GetItem(size_t(0))->GetSizer()->Layout();
+        if (wxGetApp().tabs_as_menu())
+            m_presets_choice->update();
     }
 #endif // _MSW_DARK_MODE
     Refresh();
@@ -1186,11 +1188,21 @@ void Tab::activate_option(const std::string& opt_key, const wxString& category)
         break;
     }
 
+    auto set_focus = [](wxWindow* win) {
+        win->SetFocus();
+#ifdef WIN32
+        if (wxTextCtrl* text = dynamic_cast<wxTextCtrl*>(win))
+            text->SetSelection(-1, -1);
+        else if (wxSpinCtrl* spin = dynamic_cast<wxSpinCtrl*>(win))
+            spin->SetSelection(-1, -1);
+#endif // WIN32
+    };
+
     Field* field = get_field(opt_key);
 
     // focused selected field
     if (field)
-        field->getWindow()->SetFocus();
+        set_focus(field->getWindow());
     else if (category == "Single extruder MM setup") {
         // When we show and hide "Single extruder MM setup" page, 
         // related options are still in the search list
@@ -1198,7 +1210,7 @@ void Tab::activate_option(const std::string& opt_key, const wxString& category)
         // as a "way" to show hidden page again
         field = get_field("single_extruder_multi_material");
         if (field)
-            field->getWindow()->SetFocus();
+            set_focus(field->getWindow());
     }
 
     m_highlighter.init(get_custom_ctrl_with_blinking_ptr(opt_key));
@@ -1216,12 +1228,20 @@ void Tab::cache_config_diff(const std::vector<std::string>& selected_options)
 
 void Tab::apply_config_from_cache()
 {
+    bool was_applied = false;
+    // check and apply extruders count for printer preset
+    if (m_type == Preset::TYPE_PRINTER)
+        was_applied = static_cast<TabPrinter*>(this)->apply_extruder_cnt_from_cache();
+
     if (!m_cache_config.empty()) {
         m_presets->get_edited_preset().config.apply(m_cache_config);
         m_cache_config.clear();
 
-        update_dirty();
+        was_applied = true;
     }
+
+    if (was_applied)
+        update_dirty();
 }
 
 
@@ -3216,7 +3236,7 @@ void Tab::select_preset(std::string preset_name, bool delete_current /*=false*/,
 		const PresetWithVendorProfile new_printer_preset_with_vendor_profile = m_presets->get_preset_with_vendor_profile(new_printer_preset);
         PrinterTechnology    old_printer_technology = m_presets->get_edited_preset().printer_technology();
         PrinterTechnology    new_printer_technology = new_printer_preset.printer_technology();
-        if (new_printer_technology == ptSLA && old_printer_technology == ptFFF && !may_switch_to_SLA_preset())
+        if (new_printer_technology == ptSLA && old_printer_technology == ptFFF && !wxGetApp().may_switch_to_SLA_preset(_L("New printer preset is selecting")))
             canceled = true;
         else {
             struct PresetUpdate {
@@ -3322,10 +3342,6 @@ void Tab::select_preset(std::string preset_name, bool delete_current /*=false*/,
                 m_dependent_tabs = { Preset::Type::TYPE_SLA_PRINT, Preset::Type::TYPE_SLA_MATERIAL };
         }
 
-        // check and apply extruders count for printer preset
-        if (m_type == Preset::TYPE_PRINTER)
-            static_cast<TabPrinter*>(this)->apply_extruder_cnt_from_cache();
-
         // check if there is something in the cache to move to the new selected preset
         apply_config_from_cache();
 
@@ -3393,21 +3409,6 @@ bool Tab::may_discard_current_dirty_preset(PresetCollection* presets /*= nullptr
     return true;
 }
 
-// If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have a part(s).
-// Because of we can't to print the multi-part objects with SLA technology.
-bool Tab::may_switch_to_SLA_preset()
-{
-    if (model_has_multi_part_objects(wxGetApp().model()))
-    {
-        show_info( parent(),
-                    _(L("It's impossible to print multi-part object(s) with SLA technology.")) + "\n\n" +
-                    _(L("Please check your object list before preset changing.")),
-                    _(L("Attention!")) );
-        return false;
-    }
-    return true;
-}
-
 void Tab::clear_pages()
 {
     // invalidated highlighter, if any exists
@@ -3862,15 +3863,17 @@ void TabPrinter::cache_extruder_cnt()
     m_cache_extruder_count = m_extruders_count;
 }
 
-void TabPrinter::apply_extruder_cnt_from_cache()
+bool TabPrinter::apply_extruder_cnt_from_cache()
 {
     if (m_presets->get_edited_preset().printer_technology() == ptSLA)
-        return;
+        return false;
 
     if (m_cache_extruder_count > 0) {
         m_presets->get_edited_preset().set_num_extruders(m_cache_extruder_count);
         m_cache_extruder_count = 0;
+        return true;
     }
+    return false;
 }
 
 bool Tab::validate_custom_gcodes()
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 74585f2aa..6a7b56fe4 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -282,7 +282,6 @@ public:
     // Select a new preset, possibly delete the current one.
 	void		select_preset(std::string preset_name = "", bool delete_current = false, const std::string& last_selected_ph_printer_name = "");
 	bool		may_discard_current_dirty_preset(PresetCollection* presets = nullptr, const std::string& new_printer_name = "");
-    bool        may_switch_to_SLA_preset();
 
     virtual void    clear_pages();
     virtual void    update_description_lines();
@@ -469,7 +468,7 @@ public:
 
 	wxSizer*	create_bed_shape_widget(wxWindow* parent);
 	void		cache_extruder_cnt();
-	void		apply_extruder_cnt_from_cache();
+	bool		apply_extruder_cnt_from_cache();
 };
 
 class TabSLAMaterial : public Tab
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index ef480f60f..ffa47ed63 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -727,14 +727,21 @@ void DiffViewCtrl::item_value_changed(wxDataViewEvent& event)
     m_empty_selection = selected_options().empty();
 }
 
-std::vector<std::string> DiffViewCtrl::unselected_options(Preset::Type type)
+bool DiffViewCtrl::has_unselected_options()
+{
+    for (auto item : m_items_map)
+        if (!model->IsEnabledItem(item.first))
+            return true;
+
+    return false;
+}
+
+std::vector<std::string> DiffViewCtrl::options(Preset::Type type, bool selected)
 {
     std::vector<std::string> ret;
 
     for (auto item : m_items_map) {
-        if (item.second.opt_key == "extruders_count")
-            continue;
-        if (item.second.type == type && !model->IsEnabledItem(item.first))
+        if (item.second.type == type && model->IsEnabledItem(item.first) == selected)
             ret.emplace_back(get_pure_opt_key(item.second.opt_key));
     }
 
@@ -757,20 +764,24 @@ std::vector<std::string> DiffViewCtrl::selected_options()
 //          UnsavedChangesDialog
 //------------------------------------------
 
-UnsavedChangesDialog::UnsavedChangesDialog(const wxString& header, const wxString& caption/* = wxString()*/)
-    : DPIDialog(static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, (caption.IsEmpty() ? _L("PrusaSlicer is closing") : caption) + ": " + _L("Unsaved Changes"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
-{
-    m_app_config_key = "default_action_on_close_application";
+static std::string none{"none"};
 
+UnsavedChangesDialog::UnsavedChangesDialog(const wxString& caption, const wxString& header, 
+                                           const std::string& app_config_key, int act_buttons)
+    : DPIDialog(static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, caption + ": " + _L("Unsaved Changes"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
+    m_app_config_key(app_config_key),
+    m_buttons(act_buttons)
+{
     build(Preset::TYPE_INVALID, nullptr, "", header);
 
-    const std::string& def_action = wxGetApp().app_config->get(m_app_config_key);
-    if (def_action == "none")
+    const std::string& def_action = m_app_config_key.empty() ? none : wxGetApp().app_config->get(m_app_config_key);
+    if (def_action == none)
         this->CenterOnScreen();
     else {
-        m_exit_action = def_action == ActSave ? Action::Save : Action::Discard;
-        if (m_exit_action == Action::Save)
-            save(nullptr);
+        m_exit_action = def_action == ActTransfer   ? Action::Transfer  :
+                        def_action == ActSave       ? Action::Save      : Action::Discard;
+        if (m_exit_action != Action::Discard)
+            save(nullptr, m_exit_action == Action::Save);
     }
 }
 
@@ -782,7 +793,7 @@ UnsavedChangesDialog::UnsavedChangesDialog(Preset::Type type, PresetCollection*
     build(type, dependent_presets, new_selected_preset);
 
     const std::string& def_action = wxGetApp().app_config->get(m_app_config_key);
-    if (def_action == "none") {
+    if (def_action == none) {
         if (wxGetApp().mainframe->is_dlg_layout() && wxGetApp().mainframe->m_settings_dialog.HasFocus())
             this->SetPosition(wxGetApp().mainframe->m_settings_dialog.GetPosition());
         this->CenterOnScreen();
@@ -833,7 +844,8 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection* dependent_
 
         (*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent&) {
             update_config(close_act);
-            if (close_act == Action::Save && !save(dependent_presets))
+            bool save_names_and_types = close_act == Action::Save || (close_act == Action::Transfer && ActionButtons::KEEP & m_buttons);
+            if (save_names_and_types && !save(dependent_presets, close_act == Action::Save))
                 return;
             close(close_act);
         });
@@ -842,13 +854,26 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection* dependent_
         (*btn)->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent& e) { show_info_line(Action::Undef); e.Skip(); });
     };
 
-    const PresetCollection* switched_presets = type == Preset::TYPE_INVALID ? nullptr : wxGetApp().get_tab(type)->get_presets();
-    if (dependent_presets && switched_presets && (type == dependent_presets->type() ?
-        dependent_presets->get_edited_preset().printer_technology() == dependent_presets->find_preset(new_selected_preset)->printer_technology() :
-        switched_presets->get_edited_preset().printer_technology() == switched_presets->find_preset(new_selected_preset)->printer_technology()))
-        add_btn(&m_transfer_btn, m_move_btn_id, "paste_menu", Action::Transfer, _L("Transfer"));
-    add_btn(&m_discard_btn, m_continue_btn_id, dependent_presets ? "switch_presets" : "exit", Action::Discard, _L("Discard"), false);
-    add_btn(&m_save_btn, m_save_btn_id, "save", Action::Save, _L("Save"));
+    // "Transfer" / "Keep" button
+    if (ActionButtons::TRANSFER & m_buttons) {
+        const PresetCollection* switched_presets = type == Preset::TYPE_INVALID ? nullptr : wxGetApp().get_tab(type)->get_presets();
+        if (dependent_presets && switched_presets && (type == dependent_presets->type() ?
+            dependent_presets->get_edited_preset().printer_technology() == dependent_presets->find_preset(new_selected_preset)->printer_technology() :
+            switched_presets->get_edited_preset().printer_technology() == switched_presets->find_preset(new_selected_preset)->printer_technology()))
+            add_btn(&m_transfer_btn, m_move_btn_id, "paste_menu", Action::Transfer, switched_presets->get_edited_preset().name == new_selected_preset ? _L("Keep") : _L("Transfer"));
+    }
+    if (!m_transfer_btn && (ActionButtons::KEEP & m_buttons))
+        add_btn(&m_transfer_btn, m_move_btn_id, "paste_menu", Action::Transfer, _L("Keep"));
+
+    { // "Don't save" / "Discard" button
+        std::string btn_icon    = (ActionButtons::DONT_SAVE & m_buttons) ? "" : (dependent_presets || (ActionButtons::KEEP & m_buttons)) ? "switch_presets" : "exit";
+        wxString    btn_label   = (ActionButtons::DONT_SAVE & m_buttons) ? _L("Don't save") : _L("Discard");
+        add_btn(&m_discard_btn, m_continue_btn_id, btn_icon, Action::Discard, btn_label, false);
+    }
+
+    // "Save" button
+    if (ActionButtons::SAVE & m_buttons) 
+        add_btn(&m_save_btn, m_save_btn_id, "save", Action::Save, _L("Save"));
 
     ScalableButton* cancel_btn = new ScalableButton(this, wxID_CANCEL, "cross", _L("Cancel"), wxDefaultSize, wxDefaultPosition, wxBORDER_DEFAULT, true, 24);
     buttons->Add(cancel_btn, 1, wxLEFT|wxRIGHT, 5);
@@ -859,34 +884,42 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection* dependent_
     m_info_line->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold());
     m_info_line->Hide();
 
-    m_remember_choice = new wxCheckBox(this, wxID_ANY, _L("Remember my choice"));
-    m_remember_choice->SetValue(wxGetApp().app_config->get(m_app_config_key) != "none");
-    m_remember_choice->Bind(wxEVT_CHECKBOX, [type, this](wxCommandEvent& evt)
-    {
-        if (!evt.IsChecked())
-            return;
-        wxString preferences_item = type == Preset::TYPE_INVALID ? _L("Ask for unsaved changes when closing application") : 
-                                                                   _L("Ask for unsaved changes when selecting new preset");
-        wxString msg =
-            _L("PrusaSlicer will remember your action.") + "\n\n" +
-            (type == Preset::TYPE_INVALID ?
-                _L("You will not be asked about the unsaved changes the next time you close PrusaSlicer.") :
-                _L("You will not be asked about the unsaved changes the next time you switch a preset.")) + "\n\n" +
-                format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto be asked about unsaved changes again."), preferences_item);
+    if (!m_app_config_key.empty()) {
+        m_remember_choice = new wxCheckBox(this, wxID_ANY, _L("Remember my choice"));
+        m_remember_choice->SetValue(wxGetApp().app_config->get(m_app_config_key) != none);
+        m_remember_choice->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent& evt)
+        {
+            if (!evt.IsChecked())
+                return;
+            wxString preferences_item = m_app_config_key == "default_action_on_new_project"     ? _L("Ask for unsaved changes when creating new project") : 
+                                        m_app_config_key == "default_action_on_select_preset"   ? _L("Ask for unsaved changes when selecting new preset") :
+                                                                                                  _L("Ask for unsaved changes when ??closing application??") ;
+            wxString action = m_app_config_key == "default_action_on_new_project"   ? _L("You will not be asked about the unsaved changes the next time you create new project") : 
+                              m_app_config_key == "default_action_on_select_preset" ? _L("You will not be asked about the unsaved changes the next time you switch a preset") :
+                                                                                      _L("You will not be asked about the unsaved changes the next time you: \n"
+                                                                                            "- close the application,\n"
+                                                                                            "- load project,\n"
+                                                                                            "- process Undo / Redo with change of print technologie,\n"
+                                                                                            "- take/load snapshot,\n"
+                                                                                            "- load config file/bundle,\n"
+                                                                                            "- export config_bundle") ;
+            wxString msg = _L("PrusaSlicer will remember your action.") + "\n\n" + action + "\n\n" +
+                           format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto be asked about unsaved changes again."), preferences_item);
     
-        //wxMessageDialog dialog(nullptr, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
-        MessageDialog dialog(nullptr, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
-        if (dialog.ShowModal() == wxID_CANCEL)
-            m_remember_choice->SetValue(false);
-    });
+            MessageDialog dialog(nullptr, msg, _L("PrusaSlicer: Don't ask me again"), wxOK | wxCANCEL | wxICON_INFORMATION);
+            if (dialog.ShowModal() == wxID_CANCEL)
+                m_remember_choice->SetValue(false);
+        });
+    }
 
     wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL);
 
     topSizer->Add(m_action_line,0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(m_tree,       1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(m_info_line,  0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 2*border);
-    topSizer->Add(buttons,      0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
-    topSizer->Add(m_remember_choice, 0, wxEXPAND | wxALL, border);
+    topSizer->Add(buttons,      0, wxEXPAND | wxALL, border);
+    if (m_remember_choice)
+        topSizer->Add(m_remember_choice, 0, wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, border);
 
     update(type, dependent_presets, new_selected_preset, header);
 
@@ -905,10 +938,12 @@ void UnsavedChangesDialog::show_info_line(Action action, std::string preset_name
         if (action == Action::Undef)
             text = _L("Some fields are too long to fit. Right mouse click reveals the full text.");
         else if (action == Action::Discard)
-            text = _L("All settings changes will be discarded.");
+            text = ActionButtons::DONT_SAVE & m_buttons ? _L("All settings changes will not be saved") :_L("All settings changes will be discarded.");
         else {
             if (preset_name.empty())
-                text = action == Action::Save ? _L("Save the selected options.") : _L("Transfer the selected settings to the newly selected preset.");
+                text = action == Action::Save           ? _L("Save the selected options.") : 
+                       ActionButtons::KEEP & m_buttons  ? _L("Keep the selected settings.") :
+                                                          _L("Transfer the selected settings to the newly selected preset.");
             else
                 text = format_wxstr(
                     action == Action::Save ?
@@ -927,7 +962,7 @@ void UnsavedChangesDialog::show_info_line(Action action, std::string preset_name
 
 void UnsavedChangesDialog::update_config(Action action)
 {
-    if (!m_remember_choice->GetValue())
+    if (!m_remember_choice || !m_remember_choice->GetValue())
         return;
 
     std::string act = action == Action::Transfer ? ActTransfer :
@@ -941,7 +976,7 @@ void UnsavedChangesDialog::close(Action action)
     this->EndModal(wxID_CLOSE);
 }
 
-bool UnsavedChangesDialog::save(PresetCollection* dependent_presets)
+bool UnsavedChangesDialog::save(PresetCollection* dependent_presets, bool show_save_preset_dialog/* = true*/)
 {
     names_and_types.clear();
 
@@ -979,7 +1014,7 @@ bool UnsavedChangesDialog::save(PresetCollection* dependent_presets)
             }
 
 
-        if (!types_for_save.empty()) {
+        if (show_save_preset_dialog && !types_for_save.empty()) {
             SavePresetDialog save_dlg(this, types_for_save);
             if (save_dlg.ShowModal() != wxID_OK) {
                 m_exit_action = Action::Discard;
@@ -1164,16 +1199,24 @@ void UnsavedChangesDialog::update(Preset::Type type, PresetCollection* dependent
     PresetCollection* presets = dependent_presets;
 
     // activate buttons and labels
-    m_save_btn      ->Bind(wxEVT_ENTER_WINDOW, [this, presets]              (wxMouseEvent& e) { show_info_line(Action::Save, presets ? presets->get_selected_preset().name : ""); e.Skip(); });
+    if (m_save_btn)
+        m_save_btn    ->Bind(wxEVT_ENTER_WINDOW, [this, presets]                           (wxMouseEvent& e) { show_info_line(Action::Save, presets ? presets->get_selected_preset().name : ""); e.Skip(); });
     if (m_transfer_btn) {
-        bool is_empty_name = type != dependent_presets->type();
-        m_transfer_btn  ->Bind(wxEVT_ENTER_WINDOW, [this, new_selected_preset, is_empty_name]  (wxMouseEvent& e) { show_info_line(Action::Transfer, is_empty_name ? "" : new_selected_preset); e.Skip(); });
+        bool is_empty_name = dependent_presets && type != dependent_presets->type();
+        m_transfer_btn->Bind(wxEVT_ENTER_WINDOW, [this, new_selected_preset, is_empty_name](wxMouseEvent& e) { show_info_line(Action::Transfer, is_empty_name ? "" : new_selected_preset); e.Skip(); });
     }
-    m_discard_btn  ->Bind(wxEVT_ENTER_WINDOW, [this]                       (wxMouseEvent& e) { show_info_line(Action::Discard); e.Skip(); });
-
+    if (m_discard_btn)
+        m_discard_btn ->Bind(wxEVT_ENTER_WINDOW, [this]                                    (wxMouseEvent& e) { show_info_line(Action::Discard); e.Skip(); });
 
     if (type == Preset::TYPE_INVALID) {
-        m_action_line->SetLabel(header + "\n" + _L("The following presets were modified:"));
+        PrinterTechnology printer_technology = wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology();
+        int presets_cnt = 0;
+        for (Tab* tab : wxGetApp().tabs_list)
+            if (tab->supports_printer_technology(printer_technology) && tab->current_preset_is_dirty())
+                presets_cnt++;
+        m_action_line->SetLabel((header.IsEmpty() ? "" : header + "\n\n") + 
+                                _L_PLURAL("The following preset was modified",
+                                          "The following presets were modified", presets_cnt));
     }
     else {
         wxString action_msg;
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.hpp b/src/slic3r/GUI/UnsavedChangesDialog.hpp
index 9dbaf6e99..42f93f660 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.hpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.hpp
@@ -220,8 +220,9 @@ public:
     void        context_menu(wxDataViewEvent& event);
     void        item_value_changed(wxDataViewEvent& event);
     void        set_em_unit(int em) { m_em_unit = em; }
+    bool        has_unselected_options();
 
-    std::vector<std::string> unselected_options(Preset::Type type);
+    std::vector<std::string> options(Preset::Type type, bool selected);
     std::vector<std::string> selected_options();
 };
 
@@ -261,10 +262,22 @@ class UnsavedChangesDialog : public DPIDialog
     Action m_exit_action {Action::Undef};
     // preset names which are modified in SavePresetDialog and related types
     std::vector<std::pair<std::string, Preset::Type>>  names_and_types;
+    // additional action buttons used in dialog
+    int m_buttons { ActionButtons::TRANSFER | ActionButtons::SAVE };
 
 public:
-    UnsavedChangesDialog(const wxString& header, const wxString& caption = wxString());
+    // Discard and Cancel buttons are always but next buttons are optional
+    enum ActionButtons {
+        TRANSFER  = 1,
+        KEEP      = 2,
+        SAVE      = 4,
+        DONT_SAVE = 8,
+    };
+
+    // show unsaved changes when preset is switching
     UnsavedChangesDialog(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset);
+    // show unsaved changes for all another cases
+    UnsavedChangesDialog(const wxString& caption, const wxString& header, const std::string& app_config_key, int act_buttons);
     ~UnsavedChangesDialog() {}
 
     void build(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, const wxString& header = "");
@@ -273,7 +286,8 @@ public:
     void show_info_line(Action action, std::string preset_name = "");
     void update_config(Action action);
     void close(Action action);
-    bool save(PresetCollection* dependent_presets);
+    // save information about saved presets and their types to names_and_types and show SavePresetDialog to set the names for new presets
+    bool save(PresetCollection* dependent_presets, bool show_save_preset_dialog = true);
 
     bool save_preset() const        { return m_exit_action == Action::Save;     }
     bool transfer_changes() const   { return m_exit_action == Action::Transfer; }
@@ -284,8 +298,10 @@ public:
     // short version of the previous function, for the case, when just one preset is modified
     std::string get_preset_name() { return names_and_types[0].first; }
 
-    std::vector<std::string> get_unselected_options(Preset::Type type)  { return m_tree->unselected_options(type); }
+    std::vector<std::string> get_unselected_options(Preset::Type type)  { return m_tree->options(type, false); }
+    std::vector<std::string> get_selected_options  (Preset::Type type)  { return m_tree->options(type, true); }
     std::vector<std::string> get_selected_options()                     { return m_tree->selected_options(); }
+    bool                     has_unselected_options()                   { return m_tree->has_unselected_options(); }
 
 protected:
     void on_dpi_changed(const wxRect& suggested_rect) override;
diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp
index 894803917..928171cd5 100644
--- a/src/slic3r/GUI/format.hpp
+++ b/src/slic3r/GUI/format.hpp
@@ -9,6 +9,8 @@
 
 #include <libslic3r/format.hpp>
 
+#include <wx/string.h>
+
 namespace Slic3r { 
 namespace GUI { 
 
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index a3d6384e0..5e703a37b 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -672,10 +672,9 @@ void ModeButton::focus_button(const bool focus)
                              Slic3r::GUI::wxGetApp().normal_font();
 
     SetFont(new_font);
-//#ifdef _WIN32
-//    GetParent()->Refresh();
-//#else
-#ifndef _WIN32
+#ifdef _WIN32
+    GetParent()->Refresh(); // force redraw a background of the selected mode button
+#else
     SetForegroundColour(wxSystemSettings::GetColour(focus ? wxSYS_COLOUR_BTNTEXT : 
 #if defined (__linux__) && defined (__WXGTK3__)
         wxSYS_COLOUR_GRAYTEXT
diff --git a/src/slic3r/Utils/FixModelByWin10.cpp b/src/slic3r/Utils/FixModelByWin10.cpp
index 2fbd0d937..30c81f6f7 100644
--- a/src/slic3r/Utils/FixModelByWin10.cpp
+++ b/src/slic3r/Utils/FixModelByWin10.cpp
@@ -318,7 +318,10 @@ public:
    const char* what() const throw() { return "Model repair has been canceled"; }
 };
 
-void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
+// returt FALSE, if fixing was canceled
+// fix_result is empty, if fixing finished successfully
+// fix_result containes a message if fixing failed 
+bool fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx, wxProgressDialog& progress_dialog, const wxString& msg_header, std::string& fix_result)
 {
 	std::mutex 						mutex;
 	std::condition_variable			condition;
@@ -337,11 +340,6 @@ void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
 	else
 		volumes.emplace_back(model_object.volumes[volume_idx]);
 
-	// Open a progress dialog.
-	wxProgressDialog progress_dialog(
-		_L("Model fixing"),
-		_L("Exporting model") + "...",
-		100, nullptr, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);  // ! parent of the wxProgressDialog should be nullptr to avoid flickering during the model fixing
 	// Executing the calculation in a background thread, so that the COM context could be created with its own threading model.
 	// (It seems like wxWidgets initialize the COM contex as single threaded and we need a multi-threaded context).
 	bool   success = false;
@@ -404,6 +402,7 @@ void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
 			}
 			for (size_t i = 0; i < volumes.size(); ++ i) {
 				volumes[i]->set_mesh(std::move(meshes_repaired[i]));
+				volumes[i]->calculate_convex_hull();
 				volumes[i]->set_new_unique_id();
 			}
 			model_object.invalidate_bounding_box();
@@ -423,21 +422,23 @@ void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx)
 	});
     while (! finished) {
 		condition.wait_for(lock, std::chrono::milliseconds(500), [&progress]{ return progress.updated; });
-		if (! progress_dialog.Update(progress.percent, _(progress.message)))
+		// decrease progress.percent value to avoid closing of the progress dialog
+		if (!progress_dialog.Update(progress.percent-1, msg_header + _(progress.message)))
 			canceled = true;
+		else
+			progress_dialog.Fit();
 		progress.updated = false;
     }
 
 	if (canceled) {
 		// Nothing to show.
 	} else if (success) {
-		Slic3r::GUI::MessageDialog dlg(nullptr, _L("Model repaired successfully"), _L("Model Repair by the Netfabb service"), wxICON_INFORMATION | wxOK);
-		dlg.ShowModal();
+		fix_result = "";
 	} else {
-		Slic3r::GUI::MessageDialog dlg(nullptr, _L("Model repair failed:") + " \n" + _(progress.message), _L("Model Repair by the Netfabb service"), wxICON_ERROR | wxOK);
-		dlg.ShowModal();
+		fix_result = progress.message;
 	}
 	worker_thread.join();
+	return !canceled;
 }
 
 } // namespace Slic3r
diff --git a/src/slic3r/Utils/FixModelByWin10.hpp b/src/slic3r/Utils/FixModelByWin10.hpp
index 8e4766467..a1ef4511b 100644
--- a/src/slic3r/Utils/FixModelByWin10.hpp
+++ b/src/slic3r/Utils/FixModelByWin10.hpp
@@ -3,6 +3,8 @@
 
 #include <string>
 
+class wxProgressDialog;
+
 namespace Slic3r {
 
 class Model;
@@ -12,12 +14,14 @@ class Print;
 #ifdef HAS_WIN10SDK
 
 extern bool is_windows10();
-extern void fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx);
+// returt false, if fixing was canceled
+extern bool fix_model_by_win10_sdk_gui(ModelObject &model_object, int volume_idx, wxProgressDialog& progress_dlg, const wxString& msg_header, std::string& fix_result);
 
 #else /* HAS_WIN10SDK */
 
 inline bool is_windows10() { return false; }
-inline void fix_model_by_win10_sdk_gui(ModelObject &, int) {}
+// returt false, if fixing was canceled
+inline bool fix_model_by_win10_sdk_gui(ModelObject&, int, wxProgressDialog&, const wxString&, std::string&) { return false; }
 
 #endif /* HAS_WIN10SDK */
 
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index 29d474dca..97c6cb2a5 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -720,8 +720,13 @@ void PresetUpdater::slic3r_update_notify()
 	}
 }
 
-static void reload_configs_update_gui()
+static bool reload_configs_update_gui()
 {
+	wxString header = _L("Configuration Updates causes a lost of preset modification.\n"
+						 "So, check unsaved changes and save them if necessary.");
+	if (!GUI::wxGetApp().check_and_save_current_preset_changes(_L("Updater is processing"), header, false ))
+		return false;
+
 	// Reload global configuration
 	auto* app_config = GUI::wxGetApp().app_config;
 	// System profiles should not trigger any substitutions, user profiles may trigger substitutions, but these substitutions
@@ -730,7 +735,8 @@ static void reload_configs_update_gui()
 	GUI::wxGetApp().preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem);
 	GUI::wxGetApp().load_current_presets();
 	GUI::wxGetApp().plater()->set_bed_shape();
-	GUI::wxGetApp().update_wizard_from_config();
+
+	return true;
 }
 
 PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3r_version, UpdateParams params) const
@@ -803,9 +809,9 @@ PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3
 			const auto res = dlg.ShowModal();
 			if (res == wxID_OK) {
 				BOOST_LOG_TRIVIAL(info) << "User wants to update...";
-				if (! p->perform_updates(std::move(updates)))
+				if (! p->perform_updates(std::move(updates)) ||
+					! reload_configs_update_gui())
 					return R_INCOMPAT_EXIT;
-				reload_configs_update_gui();
 				return R_UPDATE_INSTALLED;
 			}
 			else {
@@ -833,9 +839,9 @@ PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3
 			const auto res = dlg.ShowModal();
 			if (res == wxID_OK) {
 				BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update";
-				if (! p->perform_updates(std::move(updates)))
+				if (! p->perform_updates(std::move(updates)) ||
+					! reload_configs_update_gui())
 					return R_ALL_CANCELED;
-				reload_configs_update_gui();
 				return R_UPDATE_INSTALLED;
 			}
 			else {
@@ -886,8 +892,8 @@ void PresetUpdater::on_update_notification_confirm()
 	const auto res = dlg.ShowModal();
 	if (res == wxID_OK) {
 		BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update";
-		if (p->perform_updates(std::move(p->waiting_updates))) {
-			reload_configs_update_gui();
+		if (p->perform_updates(std::move(p->waiting_updates)) &&
+			reload_configs_update_gui()) {
 			p->has_waiting_updates = false;
 		}
 	}
diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp
index 6d6753ea2..3ea57edf2 100644
--- a/src/slic3r/Utils/UndoRedo.cpp
+++ b/src/slic3r/Utils/UndoRedo.cpp
@@ -45,10 +45,6 @@ static inline std::string ptr_to_string(const void* ptr)
 }
 #endif
 
-SnapshotData::SnapshotData() : printer_technology(ptUnknown), flags(0), layer_range_idx(-1)
-{
-}
-
 static std::string topmost_snapshot_name = "@@@ Topmost @@@";
 
 bool Snapshot::is_topmost() const
@@ -76,6 +72,7 @@ public:
 
 	void 	trim_begin(size_t new_begin)  { m_begin = std::max(m_begin, new_begin); }
 	void    trim_end(size_t new_end) { m_end = std::min(m_end, new_end); }
+	void 	extend_begin(size_t new_begin) { assert(new_begin <= m_begin); m_begin = new_begin; }
 	void 	extend_end(size_t new_end) { assert(new_end >= m_end); m_end = new_end; }
 
 	size_t 	memsize() const { return sizeof(this); }
@@ -108,6 +105,10 @@ public:
 	// Release all data after the given timestamp. For the ImmutableObjectHistory, the shared pointer is NOT released.
 	// Return the amount of memory released.
 	virtual size_t release_after_timestamp(size_t timestamp) = 0;
+	// Release all data between the two timestamps. For the ImmutableObjectHistory, the shared pointer is NOT released.
+	// Used for reducing the number of snapshots for noisy operations like the support point edits.
+	// Return the amount of memory released.
+	virtual size_t release_between_timestamps(size_t timestamp_start, size_t timestamp_end) = 0;
 	// Release all optional data of this history.
 	virtual size_t release_optional() = 0;
 	// Restore optional data possibly released by release_optional.
@@ -184,6 +185,34 @@ public:
 		return mem_released;
 	}
 
+	// Release all data between the two timestamps. For the ImmutableObjectHistory, the shared pointer is NOT released.
+	// Used for reducing the number of snapshots for noisy operations like the support point edits.
+	// Return the amount of memory released.
+	size_t release_between_timestamps(size_t timestamp_start, size_t timestamp_end) override {
+		size_t mem_released = 0;
+		if (! m_history.empty()) {
+			assert(this->valid());
+			// Find the span of m_history intervals that are fully in (timestamp_start, timestamp_end>, thus they will be never
+			// deserialized for any snapshot in <timestamp_start, timestamp_end).
+			auto it_lo = std::upper_bound(m_history.begin(), m_history.end(), timestamp_start, [](size_t l, const auto &r) { return l < r.begin(); });
+			auto it_hi = std::upper_bound(it_lo, m_history.end(), timestamp_end, [](size_t l, const auto &r) { return l < r.end(); });
+			if (it_lo != it_hi) {
+				// There are some intervals that start inside (timestamp_start, timestamp_end), that could be released.
+				assert(it_lo->begin() > timestamp_start && it_lo->end() <= timestamp_end);
+				assert(it_hi == m_history.end() || (it_hi->begin() > it_lo->begin() && it_hi->end() > timestamp_end));
+				if (it_lo != m_history.begin() && it_hi != m_history.end()) {
+					// One may consider merging the two intervals.
+					//FIXME merge them.
+				}
+				for (auto it = it_lo; it != it_hi; ++ it)
+					mem_released += it->memsize();
+				m_history.erase(it_lo, it_hi);
+			}
+			assert(this->valid());
+		}
+		return mem_released;
+	}
+
 protected:
 	std::vector<T>	m_history;
 };
@@ -352,9 +381,10 @@ public:
 	const Interval& interval() const { return m_interval; }
 	size_t		begin() const { return m_interval.begin(); }
 	size_t		end()   const { return m_interval.end(); }
-	void 		trim_begin(size_t timestamp) { m_interval.trim_begin(timestamp); }
-	void 		trim_end  (size_t timestamp) { m_interval.trim_end(timestamp); }
-	void 		extend_end(size_t timestamp) { m_interval.extend_end(timestamp); }
+	void 		trim_begin  (size_t timestamp) { m_interval.trim_begin(timestamp); }
+	void 		trim_end    (size_t timestamp) { m_interval.trim_end(timestamp); }
+	void 		extend_begin(size_t timestamp) { m_interval.extend_begin(timestamp); }
+	void 		extend_end  (size_t timestamp) { m_interval.extend_end(timestamp); }
 
 	bool		operator<(const MutableHistoryInterval& rhs) const { return m_interval < rhs.m_interval; }
 	bool 		operator==(const MutableHistoryInterval& rhs) const { return m_interval == rhs.m_interval; }
@@ -524,6 +554,7 @@ public:
 		m_snapshots.clear();
 		m_active_snapshot_time = 0;
 		m_current_time = 0;
+		m_saved_snapshot_time = size_t(-1);
 		m_selection.clear();
 	}
 
@@ -545,6 +576,7 @@ public:
 
     // Store the current application state onto the Undo / Redo stack, remove all snapshots after m_active_snapshot_time.
     void take_snapshot(const std::string& snapshot_name, const Slic3r::Model& model, const Slic3r::GUI::Selection& selection, const Slic3r::GUI::GLGizmosManager& gizmos, const SnapshotData &snapshot_data);
+    void reduce_noisy_snapshots(const std::string& new_name);
     void load_snapshot(size_t timestamp, Slic3r::Model& model, Slic3r::GUI::GLGizmosManager& gizmos);
 
 	bool has_undo_snapshot() const;
@@ -556,10 +588,20 @@ public:
 
 	// Snapshot history (names with timestamps).
 	const std::vector<Snapshot>& 	snapshots() const { return m_snapshots; }
+	const Snapshot&				    snapshot(size_t time) const {
+		const auto it = std::lower_bound(m_snapshots.cbegin(), m_snapshots.cend(), UndoRedo::Snapshot(time));
+		assert(it != m_snapshots.end() && it->timestamp == time);
+		return *it;
+	}
+
 	// Timestamp of the active snapshot.
 	size_t 							active_snapshot_time() const { return m_active_snapshot_time; }
 	bool 							temp_snapshot_active() const { return m_snapshots.back().timestamp == m_active_snapshot_time && ! m_snapshots.back().is_topmost_captured(); }
 
+	// Resets the "dirty project" status.
+    void 							mark_current_as_saved() { m_saved_snapshot_time = m_active_snapshot_time; }
+    bool 							project_modified() const;
+
 	const Selection& 				selection_deserialized() const { return m_selection; }
 
 //protected:
@@ -622,6 +664,10 @@ private:
 	}
 	void 							collect_garbage();
 
+	// Release snapshots between begin and end. Only erases data from m_snapshots, not from m_objects!
+	// Updates m_saved_snapshot_time.
+	std::vector<Snapshot>::iterator release_snapshots(std::vector<Snapshot>::iterator begin, std::vector<Snapshot>::iterator end);
+
 	// Maximum memory allowed to be occupied by the Undo / Redo stack. If the limit is exceeded,
 	// least recently used snapshots will be released.
 	size_t 													m_memory_limit;
@@ -634,6 +680,9 @@ private:
 	std::vector<Snapshot>									m_snapshots;
 	// Timestamp of the active snapshot.
 	size_t 													m_active_snapshot_time;
+	// Time at which the project state was saved into a project file.
+	// If set to zero, the time is not known, thus the project state should be considered unsaved.
+	size_t 													m_saved_snapshot_time { size_t(-1) };
 	// Logical time counter. m_current_time is being incremented with each snapshot taken.
 	size_t 													m_current_time;
 	// Last selection serialized or deserialized.
@@ -851,9 +900,12 @@ void StackImpl::take_snapshot(const std::string& snapshot_name, const Slic3r::Mo
 	assert(m_active_snapshot_time <= m_current_time);
 	for (auto &kvp : m_objects)
 		kvp.second->release_after_timestamp(m_active_snapshot_time);
-	{
+	bool topmost_saved = false;
+	if (! m_snapshots.empty()) {
+		// If the project was saved for the topmost snapshot, restore the "saved" state after the "topmost" snapshot is taken.
+		topmost_saved = m_active_snapshot_time == m_saved_snapshot_time && m_active_snapshot_time == m_snapshots.back().timestamp;
 		auto it = std::lower_bound(m_snapshots.begin(), m_snapshots.end(), Snapshot(m_active_snapshot_time));
-		m_snapshots.erase(it, m_snapshots.end());
+		this->release_snapshots(it, m_snapshots.end());
 	}
 	// Take new snapshots.
 	this->save_mutable_object<Slic3r::Model>(model);
@@ -865,8 +917,11 @@ void StackImpl::take_snapshot(const std::string& snapshot_name, const Slic3r::Mo
 	this->save_mutable_object<Selection>(m_selection);
     this->save_mutable_object<Slic3r::GUI::GLGizmosManager>(gizmos);
     // Save the snapshot info.
-	m_snapshots.emplace_back(snapshot_name, m_current_time ++, model.id().id, snapshot_data);
-	m_active_snapshot_time = m_current_time;
+	m_snapshots.emplace_back(snapshot_name, m_current_time, model.id().id, snapshot_data);
+	if (topmost_saved)
+		// Restore the "saved" timestamp.
+		m_saved_snapshot_time = m_current_time;
+	m_active_snapshot_time = ++ m_current_time;
 	// Save snapshot info of the last "current" aka "top most" state, that is only being serialized
 	// if undoing an action. Such a snapshot has an invalid Model ID assigned if it was not taken yet.
 	m_snapshots.emplace_back(topmost_snapshot_name, m_active_snapshot_time, 0, snapshot_data);
@@ -879,6 +934,32 @@ void StackImpl::take_snapshot(const std::string& snapshot_name, const Slic3r::Mo
 #endif /* SLIC3R_UNDOREDO_DEBUG */
 }
 
+void StackImpl::reduce_noisy_snapshots(const std::string& new_name)
+{
+	// Preceding snapshot must be a "leave gizmo" snapshot.
+	assert(! m_snapshots.empty() && m_snapshots.back().is_topmost() && m_snapshots.back().timestamp == m_active_snapshot_time);
+	auto it_last = m_snapshots.end();
+	-- it_last; -- it_last;
+	assert(it_last != m_snapshots.begin() && (it_last->snapshot_data.snapshot_type == SnapshotType::LeavingGizmoNoAction || it_last->snapshot_data.snapshot_type == SnapshotType::LeavingGizmoWithAction));
+	if (it_last->snapshot_data.snapshot_type == SnapshotType::LeavingGizmoWithAction) {
+		for (-- it_last; it_last->snapshot_data.snapshot_type != SnapshotType::EnteringGizmo; -- it_last) {
+			if (it_last->snapshot_data.snapshot_type == SnapshotType::GizmoAction) {
+                it_last->name = new_name;
+                auto it = it_last;
+				for (-- it; it->snapshot_data.snapshot_type == SnapshotType::GizmoAction; -- it) ;
+				if (++ it < it_last) {
+					// Drop (it, it_last>
+					for (auto &kvp : m_objects)
+						// Drop products of <it + 1, it_last + 1>
+						kvp.second->release_between_timestamps(it->timestamp, (it_last + 1)->timestamp);
+					it_last = this->release_snapshots(it + 1, it_last + 1);
+				}
+			}
+			assert(it_last != m_snapshots.begin());
+		}
+	}
+}
+
 void StackImpl::load_snapshot(size_t timestamp, Slic3r::Model& model, Slic3r::GUI::GLGizmosManager& gizmos)
 {
 	// Find the snapshot by time. It must exist.
@@ -934,6 +1015,7 @@ bool StackImpl::undo(Slic3r::Model &model, const Slic3r::GUI::Selection &selecti
 	bool new_snapshot_taken = false;
 	if (m_active_snapshot_time == m_snapshots.back().timestamp && ! m_snapshots.back().is_topmost_captured()) {
 		// The current state is temporary. The current state needs to be captured to be redoable.
+		//FIXME add new a "topmost" SnapshotType? 
         this->take_snapshot(topmost_snapshot_name, model, selection, gizmos, snapshot_data);
         // The line above entered another topmost_snapshot_name.
 		assert(m_snapshots.back().is_topmost());
@@ -979,6 +1061,46 @@ bool StackImpl::redo(Slic3r::Model& model, Slic3r::GUI::GLGizmosManager& gizmos,
 	return true;
 }
 
+// If a snapshot modifies the snapshot type, 
+static inline bool snapshot_modifies_project(SnapshotType type)
+{
+	return type == SnapshotType::Action || type == SnapshotType::GizmoAction || type == SnapshotType::ProjectSeparator;
+}
+
+static inline bool snapshot_modifies_project(const Snapshot &snapshot)
+{
+	return snapshot_modifies_project(snapshot.snapshot_data.snapshot_type);
+}
+
+// Release snapshots between begin and end. Only erases data from m_snapshots, not from m_objects!
+// Updates m_saved_snapshot_time.
+std::vector<Snapshot>::iterator StackImpl::release_snapshots(std::vector<Snapshot>::iterator begin, std::vector<Snapshot>::iterator end)
+{
+	assert(! m_snapshots.empty());
+	assert(begin <= end);
+	if (m_saved_snapshot_time >= begin->timestamp && (end == m_snapshots.end() || m_saved_snapshot_time < end->timestamp)) {
+		assert(m_saved_snapshot_time <= m_snapshots.back().timestamp);
+		auto it_saved = std::lower_bound(begin, end, Snapshot(m_saved_snapshot_time));
+		assert(it_saved != m_snapshots.end() && it_saved->timestamp == m_saved_snapshot_time);
+		auto it = it_saved;
+		for (; it != begin && ! snapshot_modifies_project(*it); -- it) ;
+		if (it == begin && ! snapshot_modifies_project(*it)) {
+			// Found a snapshot before begin, which captures the same project state.
+			m_saved_snapshot_time = (-- it)->timestamp;
+		} else {
+			auto it = it_saved;
+			for (; it != end && ! snapshot_modifies_project(*it); ++ it) ;
+			if (it == end && end != m_snapshots.end())
+				// Found a snapshot after end, which captures the same project state.
+				m_saved_snapshot_time = (-- it)->timestamp;				
+			else
+				// State of the project is being lost. Indicate a "likely modified" project state until the project is saved again.
+				m_saved_snapshot_time = size_t(-1);
+		}
+	}
+	return m_snapshots.erase(begin, end);
+}
+
 void StackImpl::collect_garbage()
 {
 	// Purge objects with empty histories.
@@ -1058,6 +1180,7 @@ void StackImpl::release_least_recently_used()
 				} else
 					++ it;
 			}
+			//FIXME update the "saved" snapshot time.
 			m_snapshots.erase(m_snapshots.begin());
 		}
 		assert(current_memsize >= mem_released);
@@ -1076,6 +1199,44 @@ void StackImpl::release_least_recently_used()
 #endif /* SLIC3R_UNDOREDO_DEBUG */
 }
 
+bool StackImpl::project_modified() const
+{
+	assert(! m_snapshots.empty());
+
+	if (m_saved_snapshot_time == size_t(-1))
+		// Don't know anything about the project state.
+		return true;
+	if (m_saved_snapshot_time == m_active_snapshot_time)
+		// Just saved at this step.
+		return false;
+
+	assert(m_saved_snapshot_time >= m_snapshots.front().timestamp && m_saved_snapshot_time <= m_snapshots.back().timestamp);
+
+	auto it_saved = std::lower_bound(m_snapshots.begin(), m_snapshots.end(), Snapshot(m_saved_snapshot_time));
+	assert(it_saved != m_snapshots.end() && it_saved->timestamp == m_saved_snapshot_time);
+
+#ifndef NDEBUG
+	// Verify that there is a snapshot with "current time".
+	auto it_current = std::lower_bound(m_snapshots.begin(), m_snapshots.end(), Snapshot(m_active_snapshot_time));
+	assert(it_current != m_snapshots.end() && it_current->timestamp == m_active_snapshot_time);
+#endif // NDEBUG
+
+	if (m_saved_snapshot_time < m_active_snapshot_time) {
+		// Search upwards. Ignore state of the "active" snapshot.
+		for (auto it = it_saved; it->timestamp < m_active_snapshot_time; ++ it)
+			if (snapshot_modifies_project(*it))
+				return true;
+	} else {
+		// Search downwards. Ignore state of the "saved" snapshot.
+		assert(m_saved_snapshot_time > m_active_snapshot_time);
+		for (auto it = it_saved - 1; it->timestamp >= m_active_snapshot_time; -- it)
+			if (snapshot_modifies_project(*it))
+				return true;
+	}
+
+	return false;
+}
+
 // Wrappers of the private implementation.
 Stack::Stack() : pimpl(new StackImpl()) {}
 Stack::~Stack() {}
@@ -1088,6 +1249,7 @@ size_t Stack::memsize() const { return pimpl->memsize(); }
 void Stack::release_least_recently_used() { pimpl->release_least_recently_used(); }
 void Stack::take_snapshot(const std::string& snapshot_name, const Slic3r::Model& model, const Slic3r::GUI::Selection& selection, const Slic3r::GUI::GLGizmosManager& gizmos, const SnapshotData &snapshot_data)
 	{ pimpl->take_snapshot(snapshot_name, model, selection, gizmos, snapshot_data); }
+void Stack::reduce_noisy_snapshots(const std::string& new_name) { pimpl->reduce_noisy_snapshots(new_name); }
 bool Stack::has_undo_snapshot() const { return pimpl->has_undo_snapshot(); }
 bool Stack::has_undo_snapshot(size_t time_to_load) const { return pimpl->has_undo_snapshot(time_to_load); }
 bool Stack::has_redo_snapshot() const { return pimpl->has_redo_snapshot(); }
@@ -1097,48 +1259,11 @@ bool Stack::redo(Slic3r::Model& model, Slic3r::GUI::GLGizmosManager& gizmos, siz
 const Selection& Stack::selection_deserialized() const { return pimpl->selection_deserialized(); }
 
 const std::vector<Snapshot>& Stack::snapshots() const { return pimpl->snapshots(); }
+const Snapshot& Stack::snapshot(size_t time) const { return pimpl->snapshot(time); }
 size_t Stack::active_snapshot_time() const { return pimpl->active_snapshot_time(); }
 bool Stack::temp_snapshot_active() const { return pimpl->temp_snapshot_active(); }
+void Stack::mark_current_as_saved() { pimpl->mark_current_as_saved(); }
+bool Stack::project_modified() const { return pimpl->project_modified(); }
 
 } // namespace UndoRedo
 } // namespace Slic3r
-
-
-//FIXME we should have unit tests for testing serialization of basic types as DynamicPrintConfig.
-#if 0
-#include "libslic3r/Config.hpp"
-#include "libslic3r/PrintConfig.hpp"
-namespace Slic3r {
-	bool test_dynamic_print_config_serialization() {
-		FullPrintConfig full_print_config;
-		DynamicPrintConfig cfg;
-		cfg.apply(full_print_config, false);
-
-		std::string serialized;
-	   	try {
-			std::ostringstream ss;
-			cereal::BinaryOutputArchive oarchive(ss);
-	        oarchive(cfg);
-			serialized = ss.str();
-	    } catch (std::runtime_error e) {
-	        e.what();
-	    }
-
-	    DynamicPrintConfig cfg2;
-	   	try {
-			std::stringstream ss(serialized);
-			cereal::BinaryInputArchive iarchive(ss);
-	        iarchive(cfg2);
-	    } catch (std::runtime_error e) {
-	        e.what();
-	    }
-
-	    if (cfg == cfg2) {
-	    	printf("Yes!\n");
-			return true;
-	    }
-	    printf("No!\n");
-		return false;
-	}
-} // namespace Slic3r
-#endif
diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp
index e120c4f79..fdc1eb268 100644
--- a/src/slic3r/Utils/UndoRedo.hpp
+++ b/src/slic3r/Utils/UndoRedo.hpp
@@ -8,6 +8,7 @@
 #include <cassert>
 
 #include <libslic3r/ObjectID.hpp>
+#include <libslic3r/Config.hpp>
 
 typedef double                          coordf_t;
 typedef std::pair<coordf_t, coordf_t>   t_layer_height_range;
@@ -15,7 +16,6 @@ typedef std::pair<coordf_t, coordf_t>   t_layer_height_range;
 namespace Slic3r {
 
 class Model;
-enum PrinterTechnology : unsigned char;
 
 namespace GUI {
 	class Selection;
@@ -24,6 +24,25 @@ namespace GUI {
 
 namespace UndoRedo {
 
+enum class SnapshotType : unsigned char {
+	// Some action modifying project state, outside any EnteringGizmo / LeavingGizmo interval.
+	Action,
+	// Some action modifying project state, inside some EnteringGizmo / LeavingGizmo interval.
+	GizmoAction,
+	// Selection change at the Plater.
+	Selection,
+	// New project, Reset project, Load project ...
+	ProjectSeparator,
+	// Entering a Gizmo, which opens a secondary Undo / Redo stack.
+	EnteringGizmo,
+	// Leaving a Gizmo, which closes a secondary Undo / Redo stack. 
+	// No action modifying a project state was done between EnteringGizmo / LeavingGizmo.
+	LeavingGizmoNoAction,
+	// Leaving a Gizmo, which closes a secondary Undo / Redo stack.
+	// Some action modifying a project state was done between EnteringGizmo / LeavingGizmo.
+	LeavingGizmoWithAction,
+};
+
 // Data structure to be stored with each snapshot.
 // Storing short data (bit masks, ints) with each snapshot instead of being serialized into the Undo / Redo stack
 // is likely cheaper in term of both the runtime and memory allocation.
@@ -31,13 +50,11 @@ namespace UndoRedo {
 // which may be handy sometimes.
 struct SnapshotData
 {
-	// Constructor is defined in .cpp due to the forward declaration of enum PrinterTechnology.
-	SnapshotData();
-
-	PrinterTechnology 	printer_technology;
+	SnapshotType        snapshot_type;
+	PrinterTechnology 	printer_technology { ptUnknown };
 	// Bitmap of Flags (see the Flags enum).
-	unsigned int        flags;
-    int                 layer_range_idx;
+	unsigned int        flags { 0 };
+    int                 layer_range_idx { -1 };
 
 	// Bitmask of various binary flags to be stored with the snapshot.
 	enum Flags {
@@ -103,6 +120,9 @@ public:
 
 	// Store the current application state onto the Undo / Redo stack, remove all snapshots after m_active_snapshot_time.
     void take_snapshot(const std::string& snapshot_name, const Slic3r::Model& model, const Slic3r::GUI::Selection& selection, const Slic3r::GUI::GLGizmosManager& gizmos, const SnapshotData &snapshot_data);
+    // To be called just after take_snapshot() when leaving a gizmo, inside which small edits like support point add / remove events or paiting actions were allowed.
+    // Remove all but the last edit between the gizmo enter / leave snapshots.
+    void reduce_noisy_snapshots(const std::string& new_name);
 
 	// To be queried to enable / disable the Undo / Redo buttons at the UI.
 	bool has_undo_snapshot() const;
@@ -122,14 +142,22 @@ public:
 	// There is one additional snapshot taken at the very end, which indicates the current unnamed state.
 
 	const std::vector<Snapshot>& snapshots() const;
+	const Snapshot& 		     snapshot(size_t time) const;
+
 	// Timestamp of the active snapshot. One of the snapshots of this->snapshots() shall have Snapshot::timestamp equal to this->active_snapshot_time().
-	// The snapshot time indicates start of an operation, which is finished at the time of the following snapshot, therefore
-	// the active snapshot is the successive snapshot. The same logic applies to the time_to_load parameter of undo() and redo() operations.
+	// The active snapshot may be a special placeholder "@@@ Topmost @@@" indicating an uncaptured current state,
+	// or the active snapshot may be an active state to which the application state was undoed or redoed.
 	size_t active_snapshot_time() const;
+	const Snapshot& active_snapshot() const { return this->snapshot(this->active_snapshot_time()); }
 	// Temporary snapshot is active if the topmost snapshot is active and it has not been captured yet.
 	// In that case the Undo action will capture the last snapshot.
 	bool   temp_snapshot_active() const;
 
+	// Resets the "dirty project" status.
+    void   mark_current_as_saved();
+    // Is the project modified with regard to the last "saved" state marked with mark_current_as_saved()?
+    bool   project_modified() const;
+
 	// After load_snapshot() / undo() / redo() the selection is deserialized into a list of ObjectIDs, which needs to be converted
 	// into the list of GLVolume pointers once the 3D scene is updated.
 	const Selection& selection_deserialized() const;
diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp
index f5424dfd9..32e31c264 100644
--- a/tests/fff_print/test_data.cpp
+++ b/tests/fff_print/test_data.cpp
@@ -58,12 +58,13 @@ TriangleMesh mesh(TestMesh m)
             break;
         case TestMesh::cube_with_concave_hole:
             mesh = TriangleMesh(
-            	{ {-10,-10,-5}, {-10,-10,5}, {-10,10,-5}, {-10,10,5}, {10,-10,-5}, {10,-10,5}, {-5,-5,-5}, {5,-5,-5}, {5,5,-5}, {5,10,-5}, {-5,5,-5}, Vec3d(3.06161699911402e-16,5,-5), {5,0,-5}, {0,0,-5}, {10,5,-5}, {5,10,5}, {-5,-5,5}, {5,0,5}, {5,-5,5}, {-5,5,5}, {10,5,5}, {5,5,5}, Vec3d(3.06161699911402e-16,5,5), {0,0,5} }, 
+            	{ {-10,-10,-5}, {-10,-10,5}, {-10,10,-5}, {-10,10,5}, {10,-10,-5}, {10,-10,5}, {-5,-5,-5}, {5,-5,-5}, {5,5,-5}, {5,10,-5}, {-5,5,-5}, Vec3f(3.06161699911402e-16f,5,-5), 
+                  {5,0,-5}, {0,0,-5}, {10,5,-5}, {5,10,5}, {-5,-5,5}, {5,0,5}, {5,-5,5}, {-5,5,5}, {10,5,5}, {5,5,5}, Vec3f(3.06161699911402e-16f,5,5), {0,0,5} }, 
             	{ {0,1,2}, {2,1,3}, {1,0,4}, {5,1,4}, {6,7,4}, {8,2,9}, {10,2,11}, {11,12,13}, {0,2,10}, {0,10,6}, {0,6,4}, {11,2,8}, {4,7,12}, {4,12,8}, {12,11,8}, {14,4,8}, {2,3,9}, {9,3,15}, {16,1,5}, {17,18,5}, {19,3,16}, {20,21,5}, {18,16,5}, {3,1,16}, {22,3,19}, {21,3,22}, {21,17,5}, {21,22,17}, {21,15,3}, {23,17,22}, {5,4,14}, {20,5,14}, {20,14,21}, {21,14,8}, {9,15,21}, {8,9,21}, {10,19,16}, {6,10,16}, {11,22,19}, {10,11,19}, {13,23,11}, {11,23,22}, {23,13,12}, {17,23,12}, {17,12,18}, {18,12,7}, {18,7,16}, {16,7,6} });
             break;
         case TestMesh::V:
             mesh = TriangleMesh(
-            	{ {-14,0,20}, {-14,15,20}, {0,0,0}, {0,15,0}, {-4,0,20}, {-4,15,20}, {5,0,7.14286}, {10,0,0}, {24,0,20}, {14,0,20}, {10,15,0}, {5,15,7.14286}, {14,15,20}, {24,15,20} },
+            	{ {-14,0,20}, {-14,15,20}, {0,0,0}, {0,15,0}, {-4,0,20}, {-4,15,20}, {5,0,7.14286f}, {10,0,0}, {24,0,20}, {14,0,20}, {10,15,0}, {5,15,7.14286f}, {14,15,20}, {24,15,20} },
 				{ {0,1,2}, {2,1,3}, {1,0,4}, {5,1,4}, {4,0,2}, {6,4,2}, {7,6,2}, {8,9,7}, {9,6,7}, {2,3,7}, {7,3,10}, {1,5,3}, {3,5,11}, {11,12,13}, {11,13,3}, {3,13,10}, {5,4,6}, {11,5,6}, {6,9,11}, {11,9,12}, {12,9,8}, {13,12,8}, {8,7,10}, {13,8,10} });
             break;
         case TestMesh::L:
@@ -88,7 +89,7 @@ TriangleMesh mesh(TestMesh m)
             break;
         case TestMesh::ipadstand:
             mesh = TriangleMesh(
-            	{ Vec3d(17.4344673156738,-2.69879599481136e-16,9.5), {14.2814798355103,10,9.5}, {0,0,9.5}, {31.7159481048584,10,9.5}, Vec3d(62.2344741821289,2.06667568800577e-16,20), {31.7159481048584,10,20}, Vec3d(17.4344673156738,-2.69879599481136e-16,20), {62.2344741821289,10,20}, {98.2079696655273,10,0}, Vec3d(98.2079696655273,8.56525380796383e-16,10), {98.2079696655273,0,0}, {98.2079696655273,10,20}, {98.2079696655273,0,20}, Vec3d(81.6609649658203,-4.39753856997999e-16,10), {90.0549850463867,10,10}, {78.5079803466797,10,10}, Vec3d(93.2079696655273,8.56525380796383e-16,10), {14.2814798355103,10,20}, {0,0,20}, Vec3d(87.4344711303711,2.81343962782118e-15,20), {84.2814788818359,10,20}, {0,10,20}, {0,0,0}, {0,10,0}, Vec3d(62.2344741821289,2.06667568800577e-16,30), {66.9609756469727,10,30}, {62.2344741821289,10,30}, Vec3d(70.1139602661133,8.5525763717214e-16,30), {67.7053375244141,10,28.7107200622559}, Vec3d(71.6787109375,1.24046736339707e-15,27.2897701263428) },
+            	{ Vec3f(17.4344673156738,-2.69879599481136e-16,9.5), {14.2814798355103,10,9.5}, {0,0,9.5}, {31.7159481048584,10,9.5}, Vec3f(62.2344741821289,2.06667568800577e-16,20), {31.7159481048584,10,20}, Vec3f(17.4344673156738,-2.69879599481136e-16,20), {62.2344741821289,10,20}, {98.2079696655273,10,0}, Vec3f(98.2079696655273,8.56525380796383e-16,10), {98.2079696655273,0,0}, {98.2079696655273,10,20}, {98.2079696655273,0,20}, Vec3f(81.6609649658203,-4.39753856997999e-16,10), {90.0549850463867,10,10}, {78.5079803466797,10,10}, Vec3f(93.2079696655273,8.56525380796383e-16,10), {14.2814798355103,10,20}, {0,0,20}, Vec3f(87.4344711303711,2.81343962782118e-15,20), {84.2814788818359,10,20}, {0,10,20}, {0,0,0}, {0,10,0}, Vec3f(62.2344741821289,2.06667568800577e-16,30), {66.9609756469727,10,30}, {62.2344741821289,10,30}, Vec3f(70.1139602661133,8.5525763717214e-16,30), {67.7053375244141,10,28.7107200622559}, Vec3f(71.6787109375,1.24046736339707e-15,27.2897701263428) },
 				{ {0,1,2}, {1,0,3}, {4,5,6}, {5,4,7}, {8,9,10}, {9,11,12}, {11,9,8}, {13,14,15}, {14,13,16}, {17,2,1}, {2,17,18}, {19,11,20}, {11,19,12}, {17,21,18}, {21,2,18}, {2,21,22}, {22,21,23}, {8,22,23}, {22,8,10}, {24,25,26}, {25,24,27}, {23,1,8}, {1,23,21}, {1,21,17}, {5,15,3}, {15,5,7}, {15,7,28}, {28,7,26}, {28,26,25}, {8,14,11}, {14,8,3}, {3,8,1}, {14,3,15}, {11,14,20}, {26,4,24}, {4,26,7}, {12,16,9}, {16,12,19}, {29,4,13}, {4,29,24}, {24,29,27}, {9,22,10}, {22,9,0}, {0,9,16}, {0,16,13}, {0,13,6}, {6,13,4}, {2,22,0}, {19,14,16}, {14,19,20}, {15,29,13}, {29,25,27}, {25,29,15}, {25,15,28}, {6,3,0}, {3,6,5} });
             break;
         case TestMesh::A:
@@ -98,7 +99,37 @@ TriangleMesh mesh(TestMesh m)
             break;
         case TestMesh::gt2_teeth:
             mesh = TriangleMesh(
-            	{ {15.8899993896484,19.444055557251,2.67489433288574}, {15.9129991531372,19.1590557098389,2.67489433288574}, {15.9039993286133,19.1500549316406,2.67489433288574}, {15.9489994049072,19.2490558624268,2.67489433288574}, {15.9579992294312,19.3570556640625,2.67489433288574}, {15.8819999694824,18.690055847168,2.67489433288574}, {15.8319997787476,17.7460556030273,2.67489433288574}, {15.8489999771118,18.819055557251,2.67489433288574}, {15.8589992523193,17.7190551757812,2.67489433288574}, {15.8769998550415,19.0490550994873,2.67489433288574}, {15.7529993057251,17.8080558776855,2.67489433288574}, {15.7869997024536,19.5010547637939,2.67489433288574}, {14.0329990386963,18.7170543670654,2.67489433288574}, {13.9599990844727,18.7460556030273,2.67489433288574}, {13.9869995117188,20.2840557098389,2.67489433288574}, {14.2029991149902,20.149055480957,2.67489433288574}, {14.1939992904663,19.9560546875,2.67489433288574}, {14.1939992904663,20.1670551300049,2.67489433288574}, {14.2119998931885,20.0590553283691,2.67489433288574}, {12.1899995803833,19.1840553283691,2.67489433288574}, {12.096999168396,19.1950550079346,2.67489433288574}, {12.1099996566772,20.6690559387207,2.67489433288574}, {11.382999420166,19.9750556945801,2.67489433288574}, {11.2599992752075,19.2490558624268,2.67489433288574}, {11.2369995117188,19.9320545196533,2.67489433288574}, {11.5349998474121,20.0640544891357,2.67489433288574}, {11.6259994506836,20.1550559997559,2.67489433288574}, {11.6829986572266,20.2390556335449,2.67489433288574}, {11.7369995117188,20.3570556640625,2.67489433288574}, {11.8449993133545,20.645055770874,2.67489433288574}, {11.7729988098145,20.4640560150146,2.67489433288574}, {11.7799987792969,20.5370559692383,9.41389465332031}, {11.7639999389648,20.4470558166504,2.67489433288574}, {11.9559993743896,20.6810550689697,2.67489433288574}, {12.3079996109009,20.6020545959473,2.67489433288574}, {12.1959991455078,19.1860542297363,2.67489433288574}, {12.2059993743896,20.6540546417236,2.67489433288574}, {12.3489990234375,20.3740558624268,2.67489433288574}, {12.3579998016357,20.2750549316406,2.67489433288574}, {12.3669996261597,20.266056060791,2.67489433288574}, {12.3849992752075,20.1670551300049,2.67489433288574}, {12.4269990921021,20.0680541992188,2.67489433288574}, {12.5029993057251,19.9540557861328,2.67489433288574}, {12.6169996261597,19.8550548553467,2.67489433288574}, {12.7449989318848,19.7800559997559,2.67489433288574}, {12.7629995346069,19.7800559997559,2.67489433288574}, {12.8799991607666,19.7350559234619,2.67489433288574}, {13.0369997024536,19.7250556945801,2.67489433288574}, {13.0149993896484,19.0340557098389,2.67489433288574}, {11.1699991226196,19.2580547332764,2.67489433288574}, {11.0959987640381,19.2580547332764,2.67489433288574}, {11.1209993362427,19.9230556488037,2.67489433288574}, {13.0599994659424,19.024055480957,2.67489433288574}, {14.9049997329712,18.3170547485352,2.67489433288574}, {14.8779993057251,18.3400554656982,2.67489433288574}, {14.8779993057251,19.149055480957,2.67489433288574}, {13.3039989471436,19.77805519104,2.67489433288574}, {13.1589994430542,18.9890556335449,2.67489433288574}, {13.1559991836548,19.7350559234619,2.67489433288574}, {13.4269990921021,19.8600559234619,2.67489433288574}, {13.5339994430542,19.9700546264648,2.67389440536499}, {13.6359996795654,20.1220550537109,2.67489433288574}, {13.6359996795654,20.1400547027588,2.67489433288574}, {13.6719989776611,20.2210559844971,2.67489433288574}, {13.6899995803833,20.2300548553467,2.67489433288574}, {13.7509994506836,20.3010559082031,2.67489433288574}, {13.8539991378784,20.3180541992188,2.67489433288574}, {14.8329992294312,18.3580551147461,2.67489433288574}, {14.1849994659424,19.8530559539795,2.67489433288574}, {14.0769996643066,18.7000541687012,2.67489433288574}, {14.1099996566772,20.2400550842285,2.67489433288574}, {14.2009992599487,19.6230545043945,2.67489433288574}, {14.2729997634888,19.4670543670654,2.67489433288574}, {14.3379993438721,19.3790550231934,2.67489433288574}, {14.4549999237061,19.2770557403564,2.67489433288574}, {14.5899991989136,19.2040557861328,2.67489433288574}, {14.6079998016357,19.2040557861328,2.67489433288574}, {14.7209997177124,19.1600551605225,2.67489433288574}, {15.1379995346069,19.210054397583,2.67489433288574}, {14.9949998855591,18.2680549621582,2.67489433288574}, {15.0029993057251,19.1580543518066,2.67489433288574}, {15.2369995117188,19.2760543823242,2.67489433288574}, {15.3779993057251,19.4060554504395,2.67489433288574}, {15.4539995193481,19.520055770874,2.67489433288574}, {15.471999168396,19.52805519104,2.67489433288574}, {15.5449991226196,19.5830554962158,2.67489433288574}, {15.6529998779297,19.573055267334,2.67489433288574}, {15.7059993743896,17.8360557556152,2.67489433288574}, {15.9449996948242,18.5560550689697,2.67489433288574}, {15.8589992523193,18.9380550384521,2.67489433288574}, {14.9589996337891,18.2950553894043,2.67489433288574}, {15.7779998779297,19.5100555419922,2.67489433288574}, {14.0049991607666,20.2750549316406,2.67489433288574}, {12.3489990234375,20.5000553131104,2.67489433288574}, {13.0689992904663,19.0150547027588,2.67489433288574}, {13.0999994277954,19.0100555419922,2.67489433288574}, {15.9489994049072,19.3670558929443,9.41489505767822}, {15.9489994049072,19.2490558624268,9.41489505767822}, {15.75,17.8080558776855,9.41489505767822}, {15.6639995574951,19.5710544586182,9.41489505767822}, {15.5709991455078,17.9260559082031,9.41489505767822}, {15.8769998550415,18.690055847168,9.41489505767822}, {15.8499994277954,18.8170547485352,9.41489505767822}, {15.9459991455078,18.5520553588867,9.41489505767822}, {15.914999961853,17.6890544891357,9.41489505767822}, {15.3999996185303,19.4290542602539,9.41489505767822}, {15.3099994659424,19.339054107666,9.41489505767822}, {15.3729991912842,18.0440559387207,9.41489505767822}, {15.4579992294312,19.5170555114746,9.41489505767822}, {15.5469999313354,19.5820541381836,9.41489505767822}, {13.2309989929199,19.7610549926758,9.41489505767822}, {13.168999671936,19.7360553741455,9.41489505767822}, {13.096999168396,19.0140552520752,9.41489505767822}, {13.1999988555908,18.9870548248291,9.41489505767822}, {15.1399993896484,19.2080554962158,9.41489505767822}, {15.0159997940063,19.1600551605225,9.41489505767822}, {14.9859991073608,18.2770557403564,9.41489505767822}, {15.1749992370605,18.1690559387207,9.41489505767822}, {15.9039993286133,19.1320552825928,9.41489505767822}, {15.8949995040894,19.4460544586182,9.41489505767822}, {15.8769998550415,19.0420551300049,9.41489505767822}, {12.2169990539551,20.6500549316406,9.41489505767822}, {11.9379997253418,20.6810550689697,9.41489505767822}, {11.8629989624023,19.2130546569824,9.41489505767822}, {12.096999168396,19.1950550079346,9.41489505767822}, {14.1669998168945,18.6640548706055,9.41489505767822}, {14.1039991378784,20.2460556030273,9.41489505767822}, {13.9849996566772,18.7360553741455,9.41489505767822}, {14.7349996566772,19.1590557098389,9.41489505767822}, {14.5849990844727,19.2050552368164,9.41489505767822}, {14.5719995498657,18.4850559234619,9.41489505767822}, {14.1939992904663,19.6760559082031,9.41489505767822}, {14.1849994659424,19.9330558776855,9.41489505767822}, {14.1759996414185,18.6640548706055,9.41489505767822}, {14.261999130249,19.4890556335449,9.41489505767822}, {14.3539991378784,19.3610553741455,9.41489505767822}, {14.3559989929199,18.5830554962158,9.41489505767822}, {11.6039991378784,20.1250553131104,9.41489505767822}, {11.5209999084473,20.0520553588867,9.41489505767822}, {11.4209995269775,19.2480545043945,9.41489505767822}, {11.6989994049072,20.2690544128418,9.41389465332031}, {11.7609996795654,20.4310550689697,9.41489505767822}, {11.8359994888306,19.2130546569824,9.41489505767822}, {14.1889991760254,20.1710548400879,9.41489505767822}, {13.9689998626709,20.2840557098389,9.41489505767822}, {13.8739995956421,20.315055847168,9.41489505767822}, {13.7799997329712,18.8080558776855,9.41489505767822}, {13.9869995117188,20.2750549316406,9.41489505767822}, {12.3129997253418,20.5980548858643,9.41489505767822}, {12.3399991989136,20.5090560913086,9.41489505767822}, {12.3489990234375,20.3830547332764,9.41489505767822}, {12.3599996566772,20.2680549621582,9.41489505767822}, {12.3849992752075,20.1850547790527,9.41489505767822}, {12.3849992752075,20.1670551300049,9.41489505767822}, {12.4249992370605,20.065055847168,9.41489505767822}, {12.4729995727539,19.1350555419922,9.41489505767822}, {14.4399995803833,19.2900543212891,9.41489505767822}, {14.3649997711182,18.5740547180176,9.41489505767822}, {13.5729999542236,20.0310554504395,9.41489505767822}, {13.4889993667603,19.9140548706055,9.41489505767822}, {13.5639991760254,18.8710556030273,9.41489505767822}, {13.6389999389648,20.1310558319092,9.41489505767822}, {13.6719989776611,20.2130546569824,9.41489505767822}, {13.75,20.3020553588867,9.41489505767822}, {12.7399997711182,19.7810554504395,9.41489505767822}, {12.6189994812012,19.8520545959473,9.41489505767822}, {12.5799999237061,19.1200542449951,9.41489505767822}, {12.8349990844727,19.069055557251,9.41489505767822}, {11.2669992446899,19.9350547790527,9.41489505767822}, {11.1029987335205,19.9230556488037,9.41489505767822}, {11.0209999084473,19.2600555419922,9.41489505767822}, {11.3819999694824,19.9710559844971,9.41489505767822}, {13.418999671936,19.8530559539795,9.41489505767822}, {13.4329996109009,18.9160556793213,9.41489505767822}, {11.8399991989136,20.6430549621582,9.41489505767822}, {13.3119993209839,19.7800559997559,9.41489505767822}, {15.2189998626709,19.2600555419922,9.41489505767822}, {15.1839990615845,18.1600551605225,9.41489505767822}, {15.3639993667603,18.0520553588867,9.41489505767822}, {13.0189990997314,19.7250556945801,9.41489505767822}, {12.8949995040894,19.7350559234619,9.41489505767822}, {15.9039993286133,19.1500549316406,9.41489505767822}, {15.7699995040894,19.5140552520752,9.41489505767822}, {15.8589992523193,18.9340553283691,9.41489505767822}, {14.1939992904663,19.9510555267334,9.41489505767822}, {14.2119998931885,20.0630550384521,9.41489505767822}, {14.8589992523193,19.149055480957,9.41489505767822}, {14.8159999847412,18.3670558929443,9.41489505767822}, {14.8959999084473,18.3220558166504,9.41489505767822}, {12.5189990997314,19.9360542297363,9.41489505767822}, {11.0209999084473,19.9290542602539,9.41489505767822}, {11.0209999084473,19.2530555725098,2.67489433288574}, {11.0209999084473,19.9300556182861,2.67489433288574}, {15.9799995422363,18.505931854248,5.58724021911621}, {15.9799995422363,18.5044555664062,9.41489505767822}, {15.9799995422363,18.5041732788086,2.67489433288574}, {15.9799995422363,18.1684837341309,2.67489433288574}, {15.9799995422363,18.1288299560547,9.41489505767822}, {15.9799995422363,17.9876575469971,2.67489433288574}, {15.9799995422363,17.6247596740723,3.91620373725891}, {15.9799995422363,17.6247596740723,2.67489433288574}, {15.9799995422363,17.6254329681396,4.32245063781738}, {15.9799995422363,17.8920269012451,9.41489505767822}, {15.9799995422363,17.8795108795166,2.67489433288574}, {15.9799995422363,17.629810333252,4.58585262298584}, {15.9799995422363,17.6336059570312,5.27938556671143}, {15.9799995422363,17.8311748504639,2.67489433288574}, {15.9799995422363,17.638355255127,9.41489505767822}, {15.9799995422363,17.6346111297607,5.98653984069824}, {15.9799995422363,17.8728256225586,2.67489433288574}, {15.9799995422363,18.2221603393555,2.67489433288574} },
+            	{ {15.8899993896484,19.444055557251,2.67489433288574}, {15.9129991531372,19.1590557098389,2.67489433288574}, {15.9039993286133,19.1500549316406,2.67489433288574}, {15.9489994049072,19.2490558624268,2.67489433288574},
+                  {15.9579992294312,19.3570556640625,2.67489433288574}, {15.8819999694824,18.690055847168,2.67489433288574}, {15.8319997787476,17.7460556030273,2.67489433288574}, {15.8489999771118,18.819055557251,2.67489433288574},
+                  {15.8589992523193,17.7190551757812,2.67489433288574}, {15.8769998550415,19.0490550994873,2.67489433288574}, {15.7529993057251,17.8080558776855,2.67489433288574}, {15.7869997024536,19.5010547637939,2.67489433288574},
+                  {14.0329990386963,18.7170543670654,2.67489433288574}, {13.9599990844727,18.7460556030273,2.67489433288574}, {13.9869995117188,20.2840557098389,2.67489433288574}, {14.2029991149902,20.149055480957,2.67489433288574},
+                  {14.1939992904663,19.9560546875,2.67489433288574}, {14.1939992904663,20.1670551300049,2.67489433288574}, {14.2119998931885,20.0590553283691,2.67489433288574}, {12.1899995803833,19.1840553283691,2.67489433288574},
+                  {12.096999168396,19.1950550079346,2.67489433288574}, {12.1099996566772,20.6690559387207,2.67489433288574}, {11.382999420166,19.9750556945801,2.67489433288574}, {11.2599992752075,19.2490558624268,2.67489433288574}, 
+                  {11.2369995117188,19.9320545196533,2.67489433288574}, {11.5349998474121,20.0640544891357,2.67489433288574}, {11.6259994506836,20.1550559997559,2.67489433288574}, {11.6829986572266,20.2390556335449,2.67489433288574},
+                  {11.7369995117188,20.3570556640625,2.67489433288574}, {11.8449993133545,20.645055770874,2.67489433288574}, {11.7729988098145,20.4640560150146,2.67489433288574}, {11.7799987792969,20.5370559692383,9.41389465332031}, 
+                  {11.7639999389648,20.4470558166504,2.67489433288574}, {11.9559993743896,20.6810550689697,2.67489433288574}, {12.3079996109009,20.6020545959473,2.67489433288574}, {12.1959991455078,19.1860542297363,2.67489433288574},
+                  {12.2059993743896,20.6540546417236,2.67489433288574}, {12.3489990234375,20.3740558624268,2.67489433288574}, {12.3579998016357,20.2750549316406,2.67489433288574}, {12.3669996261597,20.266056060791,2.67489433288574},
+                  {12.3849992752075,20.1670551300049,2.67489433288574}, {12.4269990921021,20.0680541992188,2.67489433288574}, {12.5029993057251,19.9540557861328,2.67489433288574}, {12.6169996261597,19.8550548553467,2.67489433288574},
+                  {12.7449989318848,19.7800559997559,2.67489433288574}, {12.7629995346069,19.7800559997559,2.67489433288574}, {12.8799991607666,19.7350559234619,2.67489433288574}, {13.0369997024536,19.7250556945801,2.67489433288574}, 
+                  {13.0149993896484,19.0340557098389,2.67489433288574}, {11.1699991226196,19.2580547332764,2.67489433288574}, {11.0959987640381,19.2580547332764,2.67489433288574}, {11.1209993362427,19.9230556488037,2.67489433288574}, 
+                  {13.0599994659424,19.024055480957,2.67489433288574}, {14.9049997329712,18.3170547485352,2.67489433288574}, {14.8779993057251,18.3400554656982,2.67489433288574}, {14.8779993057251,19.149055480957,2.67489433288574},
+                  {13.3039989471436,19.77805519104,2.67489433288574}, {13.1589994430542,18.9890556335449,2.67489433288574}, {13.1559991836548,19.7350559234619,2.67489433288574}, {13.4269990921021,19.8600559234619,2.67489433288574},
+                  {13.5339994430542,19.9700546264648,2.67389440536499}, {13.6359996795654,20.1220550537109,2.67489433288574}, {13.6359996795654,20.1400547027588,2.67489433288574}, {13.6719989776611,20.2210559844971,2.67489433288574},
+                  {13.6899995803833,20.2300548553467,2.67489433288574}, {13.7509994506836,20.3010559082031,2.67489433288574}, {13.8539991378784,20.3180541992188,2.67489433288574}, {14.8329992294312,18.3580551147461,2.67489433288574},
+                  {14.1849994659424,19.8530559539795,2.67489433288574}, {14.0769996643066,18.7000541687012,2.67489433288574}, {14.1099996566772,20.2400550842285,2.67489433288574}, {14.2009992599487,19.6230545043945,2.67489433288574},
+                  {14.2729997634888,19.4670543670654,2.67489433288574}, {14.3379993438721,19.3790550231934,2.67489433288574}, {14.4549999237061,19.2770557403564,2.67489433288574}, {14.5899991989136,19.2040557861328,2.67489433288574},
+                  {14.6079998016357,19.2040557861328,2.67489433288574}, {14.7209997177124,19.1600551605225,2.67489433288574}, {15.1379995346069,19.210054397583,2.67489433288574}, {14.9949998855591,18.2680549621582,2.67489433288574},
+                  {15.0029993057251,19.1580543518066,2.67489433288574}, {15.2369995117188,19.2760543823242,2.67489433288574}, {15.3779993057251,19.4060554504395,2.67489433288574}, {15.4539995193481,19.520055770874,2.67489433288574},
+                  {15.471999168396,19.52805519104,2.67489433288574}, {15.5449991226196,19.5830554962158,2.67489433288574}, {15.6529998779297,19.573055267334,2.67489433288574}, {15.7059993743896,17.8360557556152,2.67489433288574},
+                  {15.9449996948242,18.5560550689697,2.67489433288574}, {15.8589992523193,18.9380550384521,2.67489433288574}, {14.9589996337891,18.2950553894043,2.67489433288574}, {15.7779998779297,19.5100555419922,2.67489433288574},
+                  {14.0049991607666,20.2750549316406,2.67489433288574}, {12.3489990234375,20.5000553131104,2.67489433288574}, {13.0689992904663,19.0150547027588,2.67489433288574}, {13.0999994277954,19.0100555419922,2.67489433288574},
+                  {15.9489994049072,19.3670558929443,9.41489505767822}, {15.9489994049072,19.2490558624268,9.41489505767822}, {15.75,17.8080558776855,9.41489505767822}, {15.6639995574951,19.5710544586182,9.41489505767822},
+                  {15.5709991455078,17.9260559082031,9.41489505767822}, {15.8769998550415,18.690055847168,9.41489505767822}, {15.8499994277954,18.8170547485352,9.41489505767822}, {15.9459991455078,18.5520553588867,9.41489505767822},
+                  {15.914999961853,17.6890544891357,9.41489505767822}, {15.3999996185303,19.4290542602539,9.41489505767822}, {15.3099994659424,19.339054107666,9.41489505767822}, {15.3729991912842,18.0440559387207,9.41489505767822},
+                  {15.4579992294312,19.5170555114746,9.41489505767822}, {15.5469999313354,19.5820541381836,9.41489505767822}, {13.2309989929199,19.7610549926758,9.41489505767822}, {13.168999671936,19.7360553741455,9.41489505767822},
+                  {13.096999168396,19.0140552520752,9.41489505767822}, {13.1999988555908,18.9870548248291,9.41489505767822}, {15.1399993896484,19.2080554962158,9.41489505767822}, {15.0159997940063,19.1600551605225,9.41489505767822},
+                  {14.9859991073608,18.2770557403564,9.41489505767822}, {15.1749992370605,18.1690559387207,9.41489505767822}, {15.9039993286133,19.1320552825928,9.41489505767822}, {15.8949995040894,19.4460544586182,9.41489505767822},
+                  {15.8769998550415,19.0420551300049,9.41489505767822}, {12.2169990539551,20.6500549316406,9.41489505767822}, {11.9379997253418,20.6810550689697,9.41489505767822}, {11.8629989624023,19.2130546569824,9.41489505767822}, {12.096999168396,19.1950550079346,9.41489505767822}, {14.1669998168945,18.6640548706055,9.41489505767822}, {14.1039991378784,20.2460556030273,9.41489505767822}, {13.9849996566772,18.7360553741455,9.41489505767822}, {14.7349996566772,19.1590557098389,9.41489505767822}, {14.5849990844727,19.2050552368164,9.41489505767822}, {14.5719995498657,18.4850559234619,9.41489505767822}, {14.1939992904663,19.6760559082031,9.41489505767822}, {14.1849994659424,19.9330558776855,9.41489505767822}, {14.1759996414185,18.6640548706055,9.41489505767822}, {14.261999130249,19.4890556335449,9.41489505767822}, {14.3539991378784,19.3610553741455,9.41489505767822}, {14.3559989929199,18.5830554962158,9.41489505767822}, {11.6039991378784,20.1250553131104,9.41489505767822}, {11.5209999084473,20.0520553588867,9.41489505767822}, {11.4209995269775,19.2480545043945,9.41489505767822}, {11.6989994049072,20.2690544128418,9.41389465332031}, {11.7609996795654,20.4310550689697,9.41489505767822}, {11.8359994888306,19.2130546569824,9.41489505767822}, {14.1889991760254,20.1710548400879,9.41489505767822}, {13.9689998626709,20.2840557098389,9.41489505767822}, {13.8739995956421,20.315055847168,9.41489505767822}, {13.7799997329712,18.8080558776855,9.41489505767822}, {13.9869995117188,20.2750549316406,9.41489505767822}, {12.3129997253418,20.5980548858643,9.41489505767822}, {12.3399991989136,20.5090560913086,9.41489505767822}, {12.3489990234375,20.3830547332764,9.41489505767822}, {12.3599996566772,20.2680549621582,9.41489505767822}, {12.3849992752075,20.1850547790527,9.41489505767822}, {12.3849992752075,20.1670551300049,9.41489505767822}, {12.4249992370605,20.065055847168,9.41489505767822}, {12.4729995727539,19.1350555419922,9.41489505767822}, {14.4399995803833,19.2900543212891,9.41489505767822}, {14.3649997711182,18.5740547180176,9.41489505767822}, {13.5729999542236,20.0310554504395,9.41489505767822}, {13.4889993667603,19.9140548706055,9.41489505767822}, {13.5639991760254,18.8710556030273,9.41489505767822}, {13.6389999389648,20.1310558319092,9.41489505767822}, {13.6719989776611,20.2130546569824,9.41489505767822}, {13.75,20.3020553588867,9.41489505767822}, {12.7399997711182,19.7810554504395,9.41489505767822}, {12.6189994812012,19.8520545959473,9.41489505767822}, {12.5799999237061,19.1200542449951,9.41489505767822}, {12.8349990844727,19.069055557251,9.41489505767822}, {11.2669992446899,19.9350547790527,9.41489505767822}, {11.1029987335205,19.9230556488037,9.41489505767822}, {11.0209999084473,19.2600555419922,9.41489505767822}, {11.3819999694824,19.9710559844971,9.41489505767822}, {13.418999671936,19.8530559539795,9.41489505767822}, {13.4329996109009,18.9160556793213,9.41489505767822}, {11.8399991989136,20.6430549621582,9.41489505767822}, {13.3119993209839,19.7800559997559,9.41489505767822}, {15.2189998626709,19.2600555419922,9.41489505767822}, {15.1839990615845,18.1600551605225,9.41489505767822}, {15.3639993667603,18.0520553588867,9.41489505767822}, {13.0189990997314,19.7250556945801,9.41489505767822}, {12.8949995040894,19.7350559234619,9.41489505767822}, {15.9039993286133,19.1500549316406,9.41489505767822}, {15.7699995040894,19.5140552520752,9.41489505767822}, {15.8589992523193,18.9340553283691,9.41489505767822}, {14.1939992904663,19.9510555267334,9.41489505767822}, {14.2119998931885,20.0630550384521,9.41489505767822}, {14.8589992523193,19.149055480957,9.41489505767822}, {14.8159999847412,18.3670558929443,9.41489505767822}, {14.8959999084473,18.3220558166504,9.41489505767822}, {12.5189990997314,19.9360542297363,9.41489505767822}, {11.0209999084473,19.9290542602539,9.41489505767822}, {11.0209999084473,19.2530555725098,2.67489433288574}, {11.0209999084473,19.9300556182861,2.67489433288574}, {15.9799995422363,18.505931854248,5.58724021911621}, {15.9799995422363,18.5044555664062,9.41489505767822}, {15.9799995422363,18.5041732788086,2.67489433288574}, {15.9799995422363,18.1684837341309,2.67489433288574}, {15.9799995422363,18.1288299560547,9.41489505767822}, {15.9799995422363,17.9876575469971,2.67489433288574}, {15.9799995422363,17.6247596740723,3.91620373725891}, {15.9799995422363,17.6247596740723,2.67489433288574}, {15.9799995422363,17.6254329681396,4.32245063781738}, {15.9799995422363,17.8920269012451,9.41489505767822}, {15.9799995422363,17.8795108795166,2.67489433288574}, {15.9799995422363,17.629810333252,4.58585262298584}, {15.9799995422363,17.6336059570312,5.27938556671143}, {15.9799995422363,17.8311748504639,2.67489433288574}, {15.9799995422363,17.638355255127,9.41489505767822}, {15.9799995422363,17.6346111297607,5.98653984069824}, {15.9799995422363,17.8728256225586,2.67489433288574}, {15.9799995422363,18.2221603393555,2.67489433288574} },
 				{ {0,1,2}, {0,3,1}, {0,4,3}, {5,6,7}, {8,6,5}, {2,9,0}, {6,10,11}, {12,13,14}, {15,16,17}, {18,16,15}, {19,20,21}, {22,23,24}, {25,23,22}, {26,23,25}, {27,23,26}, {28,23,27}, {29,30,31}, {29,32,30}, {29,28,32}, {33,28,29}, {33,23,28}, {21,23,33}, {20,23,21}, {34,35,36}, {37,35,34}, {38,35,37}, {39,35,38}, {40,35,39}, {41,35,40}, {42,35,41}, {43,35,42}, {44,35,43}, {45,35,44}, {46,35,45}, {47,35,46}, {48,35,47}, {49,50,51}, {52,48,47}, {23,49,24}, {53,54,55}, {56,57,58}, {59,57,56}, {60,57,59}, {61,57,60}, {62,57,61}, {63,57,62}, {64,57,63}, {65,57,64}, {66,57,65}, {13,57,66}, {54,67,55}, {68,69,70}, {71,69,68}, {72,69,71}, {73,69,72}, {74,69,73}, {75,69,74}, {76,69,75}, {77,69,76}, {67,69,77}, {70,16,68}, {70,17,16}, {78,79,80}, {81,79,78}, {82,79,81}, {83,79,82}, {84,79,83}, {85,79,84}, {86,79,85}, {87,79,86}, {88,8,5}, {11,7,6}, {11,89,7}, {11,9,89}, {11,0,9}, {55,90,53}, {55,79,90}, {55,80,79}, {91,11,10}, {92,69,12}, {92,70,69}, {34,93,37}, {47,94,52}, {47,95,94}, {47,57,95}, {47,58,57}, {51,24,49}, {21,35,19}, {21,36,35}, {14,92,12}, {86,10,87}, {86,91,10}, {77,55,67}, {66,14,13}, {96,97,4}, {98,99,100}, {101,102,98}, {103,101,98}, {104,103,98}, {105,106,107}, {108,105,107}, {109,108,107}, {100,109,107}, {110,111,112}, {113,110,112}, {114,115,116}, {117,114,116}, {118,119,120}, {121,122,123}, {124,121,123}, {125,126,127}, {128,129,130}, {131,132,133}, {71,131,133}, {134,71,133}, {135,134,133}, {136,135,133}, {137,138,139}, {140,137,139}, {141,140,139}, {142,31,141}, {142,141,139}, {143,126,132}, {144,145,146}, {147,144,146}, {127,147,146}, {148,121,124}, {149,148,124}, {150,149,124}, {151,150,124}, {152,151,124}, {153,152,124}, {154,153,124}, {155,154,124}, {129,156,157}, {130,129,157}, {158,159,160}, {161,158,160}, {162,161,160}, {163,162,160}, {146,163,160}, {164,165,166}, {167,164,166}, {168,169,170}, {171,168,170}, {139,171,170}, {159,172,173}, {123,174,142}, {175,110,113}, {173,175,113}, {106,176,177}, {178,106,177}, {179,180,167}, {112,179,167}, {175,173,172}, {119,118,181}, {119,181,97}, {119,97,96}, {182,98,102}, {182,102,183}, {182,183,120}, {182,120,119}, {143,132,184}, {184,185,143}, {147,127,126}, {174,123,122}, {159,173,160}, {126,125,133}, {126,133,132}, {186,187,188}, {186,188,116}, {186,116,115}, {99,98,182}, {109,100,99}, {106,178,107}, {114,117,177}, {114,177,176}, {128,130,187}, {128,187,186}, {135,136,157}, {135,157,156}, {163,146,145}, {164,167,180}, {179,112,111}, {171,139,138}, {189,155,166}, {189,166,165}, {149,150,93}, {154,155,189}, {31,142,174}, {114,176,78}, {81,78,176}, {7,89,183}, {89,9,120}, {89,120,183}, {78,80,114}, {176,106,81}, {88,5,103}, {183,102,7}, {118,120,9}, {9,2,181}, {9,181,118}, {115,114,80}, {82,81,106}, {101,103,5}, {102,101,5}, {5,7,102}, {97,181,2}, {2,1,97}, {1,3,97}, {80,55,115}, {172,159,59}, {59,56,172}, {3,4,97}, {4,0,96}, {105,108,82}, {186,115,55}, {82,106,105}, {83,82,108}, {60,59,159}, {175,172,56}, {119,96,0}, {0,11,119}, {108,109,84}, {84,83,108}, {55,77,186}, {56,58,110}, {56,110,175}, {60,159,158}, {11,91,182}, {182,119,11}, {91,86,182}, {85,84,109}, {86,85,99}, {128,186,77}, {58,111,110}, {158,161,60}, {26,25,137}, {138,137,25}, {99,182,86}, {109,99,85}, {77,76,128}, {58,47,111}, {61,60,161}, {137,140,26}, {27,26,140}, {25,22,138}, {129,128,76}, {76,75,129}, {75,74,129}, {74,73,156}, {73,72,135}, {68,16,184}, {68,184,132}, {16,18,185}, {161,162,62}, {62,61,161}, {179,111,47}, {171,138,22}, {156,129,74}, {135,156,73}, {134,135,72}, {72,71,134}, {68,132,131}, {185,184,16}, {18,15,185}, {63,62,162}, {28,27,140}, {22,24,171}, {71,68,131}, {15,17,143}, {15,143,185}, {17,70,143}, {70,92,126}, {162,163,64}, {64,63,162}, {180,179,47}, {47,46,180}, {140,141,28}, {168,171,24}, {126,143,70}, {92,14,147}, {147,126,92}, {14,66,144}, {14,144,147}, {65,64,163}, {66,65,145}, {46,45,180}, {32,28,141}, {24,51,168}, {145,144,66}, {163,145,65}, {164,180,45}, {45,44,164}, {44,43,164}, {43,42,165}, {38,37,151}, {150,151,37}, {37,93,150}, {141,31,30}, {30,32,141}, {169,168,51}, {165,164,43}, {189,165,42}, {42,41,189}, {40,39,152}, {40,152,153}, {151,152,39}, {39,38,151}, {93,34,149}, {154,189,41}, {153,154,41}, {41,40,153}, {148,149,34}, {34,36,148}, {36,21,121}, {31,174,29}, {121,148,36}, {21,33,122}, {21,122,121}, {33,29,122}, {174,122,29}, {116,188,53}, {104,98,10}, {87,10,98}, {98,100,87}, {79,87,100}, {79,100,107}, {90,79,107}, {90,107,178}, {178,177,90}, {53,90,177}, {53,177,117}, {117,116,53}, {54,53,188}, {54,188,187}, {67,54,187}, {67,187,130}, {69,67,130}, {69,130,157}, {12,69,157}, {12,157,136}, {136,133,12}, {12,133,125}, {125,127,12}, {13,12,127}, {127,146,13}, {57,13,146}, {57,146,160}, {95,57,160}, {95,160,173}, {173,113,95}, {94,95,113}, {113,112,94}, {52,94,112}, {48,52,112}, {112,167,48}, {35,48,167}, {35,167,166}, {19,35,166}, {139,170,50}, {50,49,139}, {166,155,19}, {20,19,155}, {155,124,20}, {23,20,124}, {23,124,123}, {49,23,123}, {49,123,142}, {142,139,49}, {190,191,170}, {192,191,190}, {191,192,51}, {191,51,50}, {170,169,190}, {169,51,192}, {169,192,190}, {170,191,50}, {193,194,195}, {196,197,198}, {199,200,201}, {198,202,203}, {204,201,200}, {205,204,200}, {206,207,208}, {206,208,205}, {206,205,200}, {207,206,209}, {207,209,203}, {207,203,202}, {202,198,197}, {197,196,210}, {197,210,195}, {197,195,194}, {8,88,195}, {8,195,210}, {210,196,8}, {196,198,8}, {198,203,8}, {203,209,8}, {209,206,8}, {206,200,8}, {202,197,104}, {207,202,104}, {103,104,197}, {103,197,194}, {193,195,88}, {88,103,194}, {88,194,193}, {200,199,8}, {199,201,8}, {204,205,6}, {6,8,201}, {6,201,204}, {10,6,205}, {10,205,208}, {104,10,208}, {104,208,207} });
             break;
         case TestMesh::pyramid:
@@ -108,22 +139,33 @@ TriangleMesh mesh(TestMesh m)
             break;
         case TestMesh::two_hollow_squares:
             mesh = TriangleMesh(
-            	{ {66.7133483886719,104.286666870117,0}, {66.7133483886719,95.7133331298828,0}, {65.6666870117188,94.6666717529297,0}, {75.2866821289062,95.7133331298828,0}, {76.3333435058594,105.333335876465,0}, {76.3333435058594,94.6666717529297,0}, {65.6666870117188,105.33332824707,0}, {75.2866821289062,104.286666870117,0}, {71.1066818237305,104.58666229248,2.79999995231628}, {66.4133529663086,104.58666229248,2.79999995231628}, {75.5866851806641,104.58666229248,2.79999995231628}, {66.4133529663086,99.8933334350586,2.79999995231628}, {66.4133529663086,95.4133377075195,2.79999995231628}, {71.1066818237305,95.4133377075195,2.79999995231628}, {75.5866851806641,95.4133377075195,2.79999995231628}, {75.5866851806641,100.106666564941,2.79999995231628}, {74.5400161743164,103.540000915527,2.79999995231628}, {70.0320129394531,103.540000915527,2.79999995231628}, {67.4600067138672,103.540000915527,2.79999995231628}, {67.4600067138672,100.968002319336,2.79999995231628}, {67.4600067138672,96.4599990844727,2.79999995231628}, {74.5400161743164,99.0319976806641,2.79999995231628}, {74.5400161743164,96.4599990844727,2.79999995231628}, {70.0320129394531,96.4599990844727,2.79999995231628}, {123.666717529297,94.6666717529297,0}, {134.333312988281,94.6666717529297,0}, {124.413360595703,95.4133377075195,2.79999995231628}, {129.106674194336,95.4133377075195,2.79999995231628}, {133.586669921875,95.4133377075195,2.79999995231628}, {123.666717529297,105.33332824707,0}, {124.413360595703,104.58666229248,2.79999995231628}, {124.413360595703,99.8933334350586,2.79999995231628}, {134.333312988281,105.33332824707,0}, {129.106674194336,104.58666229248,2.79999995231628}, {133.586669921875,104.58666229248,2.79999995231628}, {133.586669921875,100.106666564941,2.79999995231628}, {124.713317871094,104.286666870117,0}, {124.713317871094,95.7133331298828,0}, {133.286712646484,95.7133331298828,0}, {133.286712646484,104.286666870117,0}, {132.540023803711,103.540000915527,2.79999995231628}, {128.032028198242,103.540008544922,2.79999995231628}, {125.460006713867,103.540000915527,2.79999995231628}, {125.460006713867,100.968002319336,2.79999995231628}, {125.460006713867,96.4599990844727,2.79999995231628}, {132.540023803711,99.0319976806641,2.79999995231628}, {132.540023803711,96.4599990844727,2.79999995231628}, {128.032028198242,96.4599990844727,2.79999995231628} },
+            	{ {66.7133483886719f,104.286666870117f,0}, {66.7133483886719f,95.7133331298828f,0}, {65.6666870117188f,94.6666717529297f,0}, {75.2866821289062f,95.7133331298828f,0}, {76.3333435058594f,105.333335876465f,0},
+                  {76.3333435058594f,94.6666717529297f,0}, {65.6666870117188f,105.33332824707f,0}, {75.2866821289062f,104.286666870117f,0}, {71.1066818237305f,104.58666229248f,2.79999995231628f}, {66.4133529663086f,104.58666229248f,2.79999995231628f},
+                  {75.5866851806641f,104.58666229248f,2.79999995231628f}, {66.4133529663086f,99.8933334350586f,2.79999995231628f}, {66.4133529663086f,95.4133377075195f,2.79999995231628f}, {71.1066818237305f,95.4133377075195f,2.79999995231628f}, 
+                  {75.5866851806641f,95.4133377075195f,2.79999995231628f}, {75.5866851806641f,100.106666564941f,2.79999995231628f}, {74.5400161743164f,103.540000915527f,2.79999995231628f}, {70.0320129394531f,103.540000915527f,2.79999995231628f},
+                  {67.4600067138672f,103.540000915527f,2.79999995231628f}, {67.4600067138672f,100.968002319336f,2.79999995231628f}, {67.4600067138672f,96.4599990844727f,2.79999995231628f}, {74.5400161743164f,99.0319976806641f,2.79999995231628f},
+                  {74.5400161743164f,96.4599990844727f,2.79999995231628f}, {70.0320129394531f,96.4599990844727f,2.79999995231628f}, {123.666717529297f,94.6666717529297f,0}, {134.333312988281f,94.6666717529297f,0}, {124.413360595703f,95.4133377075195f,2.79999995231628f}, 
+                  {129.106674194336f,95.4133377075195f,2.79999995231628f}, {133.586669921875f,95.4133377075195f,2.79999995231628f}, {123.666717529297f,105.33332824707f,0}, {124.413360595703f,104.58666229248f,2.79999995231628f}, 
+                  {124.413360595703f,99.8933334350586f,2.79999995231628f}, {134.333312988281f,105.33332824707f,0}, {129.106674194336f,104.58666229248f,2.79999995231628f}, {133.586669921875f,104.58666229248f,2.79999995231628f},
+                  {133.586669921875f,100.106666564941f,2.79999995231628f}, {124.713317871094f,104.286666870117f,0}, {124.713317871094f,95.7133331298828f,0}, {133.286712646484f,95.7133331298828f,0}, {133.286712646484f,104.286666870117f,0},
+                  {132.540023803711f,103.540000915527f,2.79999995231628f}, {128.032028198242f,103.540008544922f,2.79999995231628f}, {125.460006713867f,103.540000915527f,2.79999995231628f}, {125.460006713867f,100.968002319336f,2.79999995231628f},
+                  {125.460006713867f,96.4599990844727f,2.79999995231628f}, {132.540023803711f,99.0319976806641f,2.79999995231628f}, {132.540023803711f,96.4599990844727f,2.79999995231628f}, {128.032028198242f,96.4599990844727f,2.79999995231628f} },
 	            { {0,1,2}, {3,4,5}, {6,4,0}, {6,0,2}, {2,1,5}, {7,4,3}, {1,3,5}, {0,4,7}, {4,6,8}, {6,9,8}, {4,8,10}, {6,2,9}, {2,11,9}, {2,12,11}, {2,5,12}, {5,13,12}, {5,14,13}, {4,10,15}, {5,4,14}, {4,15,14}, {7,16,17}, {0,7,18}, {7,17,18}, {1,19,20}, {1,0,19}, {0,18,19}, {7,3,21}, {3,22,21}, {7,21,16}, {3,23,22}, {3,1,23}, {1,20,23}, {24,25,26}, {25,27,26}, {25,28,27}, {29,24,30}, {24,31,30}, {24,26,31}, {32,29,33}, {29,30,33}, {32,33,34}, {32,34,35}, {25,32,28}, {32,35,28}, {36,37,24}, {38,32,25}, {29,32,36}, {29,36,24}, {24,37,25}, {39,32,38}, {37,38,25}, {36,32,39}, {39,40,41}, {36,39,42}, {39,41,42}, {37,43,44}, {37,36,43}, {36,42,43}, {39,38,45}, {38,46,45}, {39,45,40}, {38,47,46}, {38,37,47}, {37,44,47}, {16,8,9}, {16,10,8}, {10,16,15}, {15,16,21}, {22,15,21}, {15,22,14}, {22,23,14}, {23,20,14}, {17,16,9}, {18,17,9}, {19,18,9}, {19,9,11}, {19,11,20}, {13,14,20}, {20,11,12}, {13,20,12}, {41,40,30}, {42,41,30}, {43,42,30}, {43,30,31}, {43,31,44}, {27,28,44}, {44,31,26}, {27,44,26}, {40,33,30}, {40,34,33}, {34,40,35}, {35,40,45}, {46,35,45}, {35,46,28}, {46,47,28}, {47,44,28} });
             break;
         case TestMesh::small_dorito:
             mesh = TriangleMesh(
-            	{ {6.00058937072754,-22.9982089996338,0}, {22.0010242462158,-49.9998741149902,0}, {-9.99957847595215,-49.999870300293,0}, {6.00071382522583,-32.2371635437012,28.0019245147705}, {11.1670551300049,-37.9727020263672,18.9601669311523}, {6.00060224533081,-26.5392456054688,10.7321853637695} },
+            	{ {6.00058937072754f,-22.9982089996338f,0}, {22.0010242462158f,-49.9998741149902f,0}, {-9.99957847595215f,-49.999870300293f,0}, {6.00071382522583f,-32.2371635437012f,28.0019245147705f},
+                  {11.1670551300049f,-37.9727020263672f,18.9601669311523f}, {6.00060224533081f,-26.5392456054688f,10.7321853637695f} },
             	{ {0,1,2}, {3,4,5}, {2,1,4}, {2,4,3}, {2,3,5}, {2,5,0}, {5,4,1}, {5,1,0} });
             break;
         case TestMesh::bridge:
             mesh = TriangleMesh(
-            	{ {75,84.5,8}, {125,84.5,8}, {75,94.5,8}, {120,84.5,5}, {125,94.5,8}, {75,84.5,0}, {80,84.5,5}, {125,84.5,0}, {125,94.5,0}, {80,94.5,5}, {75,94.5,0}, {120,94.5,5}, {120,84.5,0}, {80,94.5,0}, {80,84.5,0}, {120,94.5,0} },
+            	{ {75,84.5f,8}, {125,84.5f,8}, {75,94.5f,8}, {120,84.5f,5}, {125,94.5f,8}, {75,84.5f,0}, {80,84.5f,5}, {125,84.5f,0}, {125,94.5f,0}, {80,94.5f,5}, {75,94.5f,0}, {120,94.5f,5}, {120,84.5f,0}, {80,94.5f,0}, {80,84.5f,0}, {120,94.5f,0} },
             	{ {0,1,2}, {1,0,3}, {2,1,4}, {2,5,0}, {0,6,3}, {1,3,7}, {1,8,4}, {4,9,2}, {10,5,2}, {5,6,0}, {6,11,3}, {3,12,7}, {7,8,1}, {4,8,11}, {4,11,9}, {9,10,2}, {10,13,5}, {14,6,5}, {9,11,6}, {11,12,3}, {12,8,7}, {11,8,15}, {13,10,9}, {5,13,14}, {14,13,6}, {6,13,9}, {15,12,11}, {15,8,12} });
             break;
         case TestMesh::bridge_with_hole:
             mesh = TriangleMesh(
-            	{ {75,69.5,8}, {80,76.9091644287109,8}, {75,94.5,8}, {125,69.5,8}, {120,76.9091644287109,8}, {120,87.0908355712891,8}, {80,87.0908355712891,8}, {125,94.5,8}, {80,87.0908355712891,5}, {120,87.0908355712891,5}, {125,94.5,0}, {120,69.5,0}, {120,94.5,0}, {125,69.5,0}, {120,94.5,5}, {80,94.5,5}, {80,94.5,0}, {75,94.5,0}, {80,69.5,5}, {80,69.5,0}, {80,76.9091644287109,5}, {120,69.5,5}, {75,69.5,0}, {120,76.9091644287109,5} },
+            	{ {75,69.5f,8}, {80,76.9091644287109f,8}, {75,94.5f,8}, {125,69.5f,8}, {120,76.9091644287109f,8}, {120,87.0908355712891f,8}, {80,87.0908355712891f,8}, {125,94.5f,8}, {80,87.0908355712891f,5}, {120,87.0908355712891f,5}, {125,94.5f,0}, {120,69.5f,0}, {120,94.5f,0}, {125,69.5f,0}, {120,94.5f,5}, {80,94.5f,5}, {80,94.5f,0}, {75,94.5f,0}, {80,69.5f,5}, {80,69.5f,0}, {80,76.9091644287109f,5}, {120,69.5,5}, {75,69.5f,0}, {120,76.9091644287109f,5} },
             	{ {0,1,2}, {1,0,3}, {1,3,4}, {4,3,5}, {2,6,7}, {6,2,1}, {7,6,5}, {7,5,3}, {5,8,9}, {8,5,6}, {10,11,12}, {11,10,13}, {14,8,15}, {8,14,9}, {2,16,17}, {16,2,15}, {15,2,14}, {14,10,12}, {10,14,7}, {7,14,2}, {16,18,19}, {18,16,20}, {20,16,1}, {1,16,8}, {8,16,15}, {6,1,8}, {3,11,13}, {11,3,21}, {21,3,18}, {18,22,19}, {22,18,0}, {0,18,3}, {16,22,17}, {22,16,19}, {2,22,0}, {22,2,17}, {5,23,4}, {23,11,21}, {11,23,12}, {12,23,9}, {9,23,5}, {12,9,14}, {23,18,20}, {18,23,21}, {10,3,13}, {3,10,7}, {1,23,20}, {23,1,4} });
             break;
         case TestMesh::step:
@@ -133,7 +175,7 @@ TriangleMesh mesh(TestMesh m)
             break;
         case TestMesh::slopy_cube:
             mesh = TriangleMesh(
-            	{ {-10,-10,0}, {-10,-10,20}, {-10,10,0}, {-10,10,20}, {0,-10,10}, {10,-10,0}, {2.92893,-10,10}, {10,-10,2.92893}, {0,-10,20}, {10,10,0}, {0,10,10}, {0,10,20}, {2.92893,10,10}, {10,10,2.92893} },
+            	{ {-10,-10,0}, {-10,-10,20}, {-10,10,0}, {-10,10,20}, {0,-10,10}, {10,-10,0}, {2.92893f,-10,10}, {10,-10,2.92893f}, {0,-10,20}, {10,10,0}, {0,10,10}, {0,10,20}, {2.92893f,10,10}, {10,10,2.92893f} },
             	{ {0,1,2}, {2,1,3}, {4,0,5}, {4,1,0}, {6,4,7}, {7,4,5}, {4,8,1}, {0,2,5}, {5,2,9}, {2,10,9}, {10,3,11}, {2,3,10}, {9,10,12}, {13,9,12}, {3,1,8}, {11,3,8}, {10,11,8}, {4,10,8}, {6,12,10}, {4,6,10}, {7,13,12}, {6,7,12}, {7,5,9}, {13,7,9} });
             break;
         default:
@@ -141,7 +183,6 @@ TriangleMesh mesh(TestMesh m)
             break;        
     }
 
-    mesh.repair();
     return mesh;
 }
 
diff --git a/tests/fff_print/test_trianglemesh.cpp b/tests/fff_print/test_trianglemesh.cpp
index fa6237c8b..6faaf1584 100644
--- a/tests/fff_print/test_trianglemesh.cpp
+++ b/tests/fff_print/test_trianglemesh.cpp
@@ -17,12 +17,13 @@
 using namespace Slic3r;
 using namespace std;
 
+static inline TriangleMesh make_cube() { return make_cube(20., 20, 20); }
+
 SCENARIO( "TriangleMesh: Basic mesh statistics") {
     GIVEN( "A 20mm cube, built from constexpr std::array" ) {
-        std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
+        std::vector<Vec3f> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
         std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
+        TriangleMesh cube(vertices, facets);
         
         THEN( "Volume is appropriate for 20mm square cube.") {
             REQUIRE(abs(cube.volume() - 20.0*20.0*20.0) < 1e-2);
@@ -68,64 +69,11 @@ SCENARIO( "TriangleMesh: Basic mesh statistics") {
         }
 
     }
-    GIVEN( "A 20mm cube with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
-
-        THEN( "Volume is appropriate for 20mm square cube.") {
-            REQUIRE(abs(cube.volume() - 20.0*20.0*20.0) < 1e-2);
-        }
-
-        THEN( "Vertices array matches input.") {
-            for (size_t i = 0U; i < cube.its.vertices.size(); i++) {
-                REQUIRE(cube.its.vertices.at(i) == vertices.at(i).cast<float>());
-            }
-            for (size_t i = 0U; i < vertices.size(); i++) {
-                REQUIRE(vertices.at(i).cast<float>() == cube.its.vertices.at(i));
-            }
-        }
-        THEN( "Vertex count matches vertex array size.") {
-            REQUIRE(cube.facets_count() == facets.size());
-        }
-
-        THEN( "Facet array matches input.") {
-            for (size_t i = 0U; i < cube.its.indices.size(); i++) {
-                REQUIRE(cube.its.indices.at(i) == facets.at(i));
-            }
-
-            for (size_t i = 0U; i < facets.size(); i++) {
-                REQUIRE(facets.at(i) == cube.its.indices.at(i));
-            }
-        }
-        THEN( "Facet count matches facet array size.") {
-            REQUIRE(cube.facets_count() == facets.size());
-        }
-
-#if 0
-        THEN( "Number of normals is equal to the number of facets.") {
-            REQUIRE(cube.normals().size() == facets.size());
-        }
-#endif
-
-        THEN( "center() returns the center of the object.") {
-            REQUIRE(cube.center() == Vec3d(10.0,10.0,10.0));
-        }
-
-        THEN( "Size of cube is (20,20,20)") {
-            REQUIRE(cube.size() == Vec3d(20,20,20));
-        }
-    }
 }
 
 SCENARIO( "TriangleMesh: Transformation functions affect mesh as expected.") {
     GIVEN( "A 20mm cube with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
+        auto cube = make_cube();
 
         WHEN( "The cube is scaled 200% uniformly") {
             cube.scale(2.0);
@@ -134,7 +82,7 @@ SCENARIO( "TriangleMesh: Transformation functions affect mesh as expected.") {
             }
         }
         WHEN( "The resulting cube is scaled 200% in the X direction") {
-            cube.scale(Vec3d(2.0, 1, 1));
+            cube.scale(Vec3f(2.0, 1, 1));
             THEN( "The volume is doubled.") {
                 REQUIRE(abs(cube.volume() - 2*20.0*20.0*20.0) < 1e-2);
             }
@@ -144,7 +92,7 @@ SCENARIO( "TriangleMesh: Transformation functions affect mesh as expected.") {
         }
 
         WHEN( "The cube is scaled 25% in the X direction") {
-            cube.scale(Vec3d(0.25, 1, 1));
+            cube.scale(Vec3f(0.25, 1, 1));
             THEN( "The volume is 25% of the previous volume.") {
                 REQUIRE(abs(cube.volume() - 0.25*20.0*20.0*20.0) < 1e-2);
             }
@@ -177,7 +125,10 @@ SCENARIO( "TriangleMesh: Transformation functions affect mesh as expected.") {
             cube.translate(5.0, 10.0, 0.0);
             cube.align_to_origin();
             THEN( "The third vertex is located at 0,0,0") {
-                REQUIRE(cube.its.vertices.at(2) == Vec3f(0.0, 0.0, 0.0));
+                REQUIRE(cube.its.vertices.at(2) == Vec3f::Zero());
+            }
+            THEN( "Size is OK") {
+                REQUIRE(cube.stats().size == Vec3f(20.f, 20.f, 20.f));
             }
         }
     }
@@ -185,11 +136,8 @@ SCENARIO( "TriangleMesh: Transformation functions affect mesh as expected.") {
 
 SCENARIO( "TriangleMesh: slice behavior.") {
     GIVEN( "A 20mm cube with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
-
+        auto cube = make_cube();
+        
         WHEN("Cube is sliced with z = [0+EPSILON,2,4,8,6,8,10,12,14,16,18,20]") {
             std::vector<double> z { 0+EPSILON,2,4,8,6,8,10,12,14,16,18,20 };
 			std::vector<ExPolygons> result = cube.slice(z);
@@ -206,12 +154,12 @@ SCENARIO( "TriangleMesh: slice behavior.") {
         }
     }
     GIVEN( "A STL with an irregular shape.") {
-        const std::vector<Vec3d> vertices {{0,0,0},{0,0,20},{0,5,0},{0,5,20},{50,0,0},{50,0,20},{15,5,0},{35,5,0},{15,20,0},{50,5,0},{35,20,0},{15,5,10},{50,5,20},{35,5,10},{35,20,10},{15,20,10}};
+        const std::vector<Vec3f> vertices {{0,0,0},{0,0,20},{0,5,0},{0,5,20},{50,0,0},{50,0,20},{15,5,0},{35,5,0},{15,20,0},{50,5,0},{35,20,0},{15,5,10},{50,5,20},{35,5,10},{35,20,10},{15,20,10}};
         const std::vector<Vec3i> facets {{0,1,2},{2,1,3},{1,0,4},{5,1,4},{0,2,4},{4,2,6},{7,6,8},{4,6,7},{9,4,7},{7,8,10},{2,3,6},{11,3,12},{7,12,9},{13,12,7},{6,3,11},{11,12,13},{3,1,5},{12,3,5},{5,4,9},{12,5,9},{13,7,10},{14,13,10},{8,15,10},{10,15,14},{6,11,8},{8,11,15},{15,11,13},{14,15,13}};
 
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
+		auto cube = make_cube();
         WHEN(" a top tangent plane is sliced") {
+            // At Z = 10 we have a top horizontal surface.
 			std::vector<ExPolygons> slices = cube.slice({5.0, 10.0});
             THEN( "its area is included") {
                 REQUIRE(slices.at(0).at(0).area() > 0);
@@ -240,9 +188,6 @@ SCENARIO( "make_xxx functions produce meshes.") {
             THEN("The mesh volume is 20*20*20") {
                 REQUIRE(abs(cube.volume() - 20.0*20.0*20.0) < 1e-2);
             }
-            THEN("The resulting mesh is in the repaired state.") {
-                REQUIRE(cube.repaired == true);
-            }
             THEN("There are 12 facets.") {
                 REQUIRE(cube.its.indices.size() == 12);
             }
@@ -266,9 +211,6 @@ SCENARIO( "make_xxx functions produce meshes.") {
             THEN("Resulting mesh has 2*PI/angle * 4 facets") {
                 REQUIRE(cyl.its.indices.size() == (2*PI/angle)*4);
             }
-            THEN("The resulting mesh is in the repaired state.") {
-                REQUIRE(cyl.repaired == true);
-            }
             THEN( "The mesh volume is approximately 10pi * 10^2") {
                 REQUIRE(abs(cyl.volume() - (10.0 * M_PI * std::pow(10,2))) < 1);
             }
@@ -283,9 +225,6 @@ SCENARIO( "make_xxx functions produce meshes.") {
                 REQUIRE(std::count_if(verts.begin(), verts.end(), [](const Vec3f& t) { return is_approx(t, Vec3f(0.f, 0.f, 10.f)); } ) == 1);
 				REQUIRE(std::count_if(verts.begin(), verts.end(), [](const Vec3f& t) { return is_approx(t, Vec3f(0.f, 0.f, -10.f)); } ) == 1);
             }
-            THEN("The resulting mesh is in the repaired state.") {
-                REQUIRE(sph.repaired == true);
-            }
             THEN( "The mesh volume is approximately 4/3 * pi * 10^3") {
                 REQUIRE(abs(sph.volume() - (4.0/3.0 * M_PI * std::pow(10,3))) < 1); // 1% tolerance?
             }
@@ -295,32 +234,25 @@ SCENARIO( "make_xxx functions produce meshes.") {
 
 SCENARIO( "TriangleMesh: split functionality.") {
     GIVEN( "A 20mm cube with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
+		auto cube = make_cube();
         WHEN( "The mesh is split into its component parts.") {
-            std::vector<TriangleMesh*> meshes = cube.split();
+            std::vector<TriangleMesh> meshes = cube.split();
             THEN(" The bounding box statistics are propagated to the split copies") {
                 REQUIRE(meshes.size() == 1);
-                REQUIRE((meshes.at(0)->bounding_box() == cube.bounding_box()));
+                REQUIRE((meshes.front().bounding_box() == cube.bounding_box()));
             }
         }
     }
     GIVEN( "Two 20mm cubes, each with one corner on the origin, merged into a single TriangleMesh") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
-		TriangleMesh cube2(vertices, facets);
-        cube2.repair();
+		auto cube = make_cube();
+		TriangleMesh cube2(cube);
 
         cube.merge(cube2);
-        cube.repair();
         WHEN( "The combined mesh is split") {
-            std::vector<TriangleMesh*> meshes = cube.split();
+            THEN( "Number of faces is 2x the source.") {
+                REQUIRE(cube.facets_count() == 2 * cube2.facets_count());
+            }
+            std::vector<TriangleMesh> meshes = cube.split();
             THEN( "Two meshes are in the output vector.") {
                 REQUIRE(meshes.size() == 2);
             }
@@ -330,19 +262,13 @@ SCENARIO( "TriangleMesh: split functionality.") {
 
 SCENARIO( "TriangleMesh: Mesh merge functions") {
     GIVEN( "Two 20mm cubes, each with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
-		TriangleMesh cube2(vertices, facets);
-        cube2.repair();
+		auto cube = make_cube();
+		TriangleMesh cube2(cube);
 
         WHEN( "The two meshes are merged") {
             cube.merge(cube2);
-            cube.repair();
             THEN( "There are twice as many facets in the merged mesh as the original.") {
-                REQUIRE(cube.stl.stats.number_of_facets == 2 * cube2.stl.stats.number_of_facets);
+                REQUIRE(cube.facets_count() == 2 * cube2.facets_count());
             }
         }
     }
@@ -350,11 +276,7 @@ SCENARIO( "TriangleMesh: Mesh merge functions") {
 
 SCENARIO( "TriangleMeshSlicer: Cut behavior.") {
     GIVEN( "A 20mm cube with one corner on the origin") {
-        const std::vector<Vec3d> vertices { {20,20,0}, {20,0,0}, {0,0,0}, {0,20,0}, {20,20,20}, {0,20,20}, {0,0,20}, {20,0,20} };
-        const std::vector<Vec3i> facets { {0,1,2}, {0,2,3}, {4,5,6}, {4,6,7}, {0,4,7}, {0,7,1}, {1,7,6}, {1,6,2}, {2,6,5}, {2,5,3}, {4,0,3}, {4,3,5} };
-
-		TriangleMesh cube(vertices, facets);
-        cube.repair();
+		auto cube = make_cube();
         WHEN( "Object is cut at the bottom") {
             indexed_triangle_set upper {};
             indexed_triangle_set lower {};
@@ -384,7 +306,6 @@ TEST_CASE("Regression test for issue #4486 - files take forever to slice") {
     TriangleMesh mesh;
     DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
     mesh.ReadSTLFile(std::string(testfile_dir) + "test_trianglemesh/4486/100_000.stl");
-    mesh.repair();
 
     config.set("layer_height", 500);
     config.set("first_layer_height", 250);
@@ -412,7 +333,6 @@ TEST_CASE("Profile test for issue #4486 - files take forever to slice") {
     TriangleMesh mesh;
     DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
     mesh.ReadSTLFile(std::string(testfile_dir) + "test_trianglemesh/4486/10_000.stl");
-    mesh.repair();
 
     config.set("layer_height", 500);
     config.set("first_layer_height", 250);
diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt
index 575878cf2..05898db28 100644
--- a/tests/libslic3r/CMakeLists.txt
+++ b/tests/libslic3r/CMakeLists.txt
@@ -23,6 +23,7 @@ add_executable(${_TEST_NAME}_tests
     test_png_io.cpp
     test_timeutils.cpp
     test_indexed_triangle_set.cpp
+    ../libnest2d/printer_parts.cpp
 	)
 
 if (TARGET OpenVDB::openvdb)
diff --git a/tests/libslic3r/test_3mf.cpp b/tests/libslic3r/test_3mf.cpp
index 5ab000d04..0ebe47a07 100644
--- a/tests/libslic3r/test_3mf.cpp
+++ b/tests/libslic3r/test_3mf.cpp
@@ -65,10 +65,7 @@ SCENARIO("Export+Import geometry to/from 3mf file cycle", "[3mf]") {
 
             // compare meshes
             TriangleMesh src_mesh = src_model.mesh();
-            src_mesh.repair();
-
             TriangleMesh dst_mesh = dst_model.mesh();
-            dst_mesh.repair();
 
             bool res = src_mesh.its.vertices.size() == dst_mesh.its.vertices.size();
             if (res) {
diff --git a/tests/libslic3r/test_aabbindirect.cpp b/tests/libslic3r/test_aabbindirect.cpp
index c0792a943..3b834c442 100644
--- a/tests/libslic3r/test_aabbindirect.cpp
+++ b/tests/libslic3r/test_aabbindirect.cpp
@@ -9,7 +9,6 @@ using namespace Slic3r;
 TEST_CASE("Building a tree over a box, ray caster and closest query", "[AABBIndirect]")
 {
     TriangleMesh tmesh = make_cube(1., 1., 1.);
-    tmesh.repair();
 
     auto tree = AABBTreeIndirect::build_aabb_tree_over_indexed_triangle_set(tmesh.its.vertices, tmesh.its.indices);
     REQUIRE(! tree.empty());
diff --git a/tests/libslic3r/test_clipper_utils.cpp b/tests/libslic3r/test_clipper_utils.cpp
index bbf76ea18..3cbd21a40 100644
--- a/tests/libslic3r/test_clipper_utils.cpp
+++ b/tests/libslic3r/test_clipper_utils.cpp
@@ -99,7 +99,7 @@ SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") {
 			{ 74730000, 74730000 }, { 55270000, 74730000 }, { 55270000, 68063296 }, { 44730000, 68063296 }, { 44730000, 74730000 }, { 25270000, 74730000 }, { 25270000, 55270000 }, { 31936670, 55270000 },
 			{ 31936670, 44730000 }, { 25270000, 44730000 }, { 25270000, 25270000 }, { 44730000, 25270000 }, { 44730000, 31936670 } };
 		Slic3r::Polygon clip { {75200000, 45200000}, {54800000, 45200000}, {54800000, 24800000}, {75200000, 24800000} };
-		Slic3r::Polylines result = Slic3r::intersection_pl({ subject }, { clip });
+        Slic3r::Polylines result = Slic3r::intersection_pl(subject, { clip });
 		THEN("intersection_pl - result is not empty") {
 			REQUIRE(result.size() == 1);
 		}
@@ -117,7 +117,7 @@ SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") {
 	GIVEN("Clipper bug #126") {
 		Slic3r::Polyline subject { { 200000, 19799999 }, { 200000, 200000 }, { 24304692, 200000 }, { 15102879, 17506106 }, { 13883200, 19799999 }, { 200000, 19799999 } };
 		Slic3r::Polygon clip { { 15257205, 18493894 }, { 14350057, 20200000 }, { -200000, 20200000 }, { -200000, -200000 }, { 25196917, -200000 } };
-		Slic3r::Polylines result = Slic3r::intersection_pl({ subject }, { clip });
+		Slic3r::Polylines result = Slic3r::intersection_pl(subject, { clip });
 		THEN("intersection_pl - result is not empty") {
 			REQUIRE(result.size() == 1);
 		}
diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp
index 97729ac8e..213105084 100644
--- a/tests/libslic3r/test_config.cpp
+++ b/tests/libslic3r/test_config.cpp
@@ -3,6 +3,11 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/LocalesUtils.hpp"
 
+#include <cereal/types/polymorphic.hpp>
+#include <cereal/types/string.hpp> 
+#include <cereal/types/vector.hpp> 
+#include <cereal/archives/binary.hpp>
+
 using namespace Slic3r;
 
 SCENARIO("Generic config validation performs as expected.", "[Config]") {
@@ -202,3 +207,33 @@ SCENARIO("Config ini load/save interface", "[Config]") {
         }
     }
 }
+
+SCENARIO("DynamicPrintConfig serialization", "[Config]") {
+    WHEN("DynamicPrintConfig is serialized and deserialized") {
+        FullPrintConfig full_print_config;
+        DynamicPrintConfig cfg;
+        cfg.apply(full_print_config, false);
+
+        std::string serialized;
+        try {
+            std::ostringstream ss;
+            cereal::BinaryOutputArchive oarchive(ss);
+            oarchive(cfg);
+            serialized = ss.str();
+        } catch (std::runtime_error e) {
+            e.what();
+        }
+
+        THEN("Config object contains ini file options.") {
+            DynamicPrintConfig cfg2;
+            try {
+                std::stringstream ss(serialized);
+                cereal::BinaryInputArchive iarchive(ss);
+                iarchive(cfg2);
+            } catch (std::runtime_error e) {
+                e.what();
+            }
+            REQUIRE(cfg == cfg2);
+        }
+    }
+}
diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp
index 24e0908cc..b183de1b4 100644
--- a/tests/libslic3r/test_geometry.cpp
+++ b/tests/libslic3r/test_geometry.cpp
@@ -9,6 +9,14 @@
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ShortestPath.hpp"
 
+//#include <random>
+//#include "libnest2d/tools/benchmark.h"
+#include "libslic3r/SVG.hpp"
+
+#include "../libnest2d/printer_parts.hpp"
+
+#include <unordered_set>
+
 using namespace Slic3r;
 
 TEST_CASE("Polygon::contains works properly", "[Geometry]"){
@@ -452,3 +460,225 @@ SCENARIO("Ported from xs/t/14_geometry.t", "[Geometry]"){
     	REQUIRE(! Slic3r::Geometry::directions_parallel(M_PI /2, PI, M_PI /180));
     }
 }
+
+TEST_CASE("Convex polygon intersection on two disjoint squares", "[Geometry][Rotcalip]") {
+    Polygon A{{0, 0}, {10, 0}, {10, 10}, {0, 10}};
+    A.scale(1. / SCALING_FACTOR);
+
+    Polygon B = A;
+    B.translate(20 / SCALING_FACTOR, 0);
+
+    bool is_inters = Geometry::intersects(A, B);
+
+    REQUIRE(is_inters == false);
+}
+
+TEST_CASE("Convex polygon intersection on two intersecting squares", "[Geometry][Rotcalip]") {
+    Polygon A{{0, 0}, {10, 0}, {10, 10}, {0, 10}};
+    A.scale(1. / SCALING_FACTOR);
+
+    Polygon B = A;
+    B.translate(5 / SCALING_FACTOR, 5 / SCALING_FACTOR);
+
+    bool is_inters = Geometry::intersects(A, B);
+
+    REQUIRE(is_inters == true);
+}
+
+TEST_CASE("Convex polygon intersection on two squares touching one edge", "[Geometry][Rotcalip]") {
+    Polygon A{{0, 0}, {10, 0}, {10, 10}, {0, 10}};
+    A.scale(1. / SCALING_FACTOR);
+
+    Polygon B = A;
+    B.translate(10 / SCALING_FACTOR, 0);
+
+    bool is_inters = Geometry::intersects(A, B);
+
+    REQUIRE(is_inters == false);
+}
+
+TEST_CASE("Convex polygon intersection on two squares touching one vertex", "[Geometry][Rotcalip]") {
+    Polygon A{{0, 0}, {10, 0}, {10, 10}, {0, 10}};
+    A.scale(1. / SCALING_FACTOR);
+
+    Polygon B = A;
+    B.translate(10 / SCALING_FACTOR, 10 / SCALING_FACTOR);
+
+    SVG svg{std::string("one_vertex_touch") + ".svg"};
+    svg.draw(A, "blue");
+    svg.draw(B, "green");
+    svg.Close();
+
+    bool is_inters = Geometry::intersects(A, B);
+
+    REQUIRE(is_inters == false);
+}
+
+TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][Rotcalip]") {
+    Polygon A{{0, 0}, {10, 0}, {10, 10}, {0, 10}};
+    A.scale(1. / SCALING_FACTOR);
+
+    Polygon B = A;
+
+    bool is_inters = Geometry::intersects(A, B);
+
+    REQUIRE(is_inters == true);
+}
+
+//// Only for benchmarking
+//static Polygon gen_convex_poly(std::mt19937_64 &rg, size_t point_cnt)
+//{
+//    std::uniform_int_distribution<coord_t> dist(0, 100);
+
+//    Polygon out;
+//    out.points.reserve(point_cnt);
+
+//    coord_t tr = dist(rg) * 2 / SCALING_FACTOR;
+
+//    for (size_t i = 0; i < point_cnt; ++i)
+//        out.points.emplace_back(tr + dist(rg) / SCALING_FACTOR,
+//                                tr + dist(rg) / SCALING_FACTOR);
+
+//    return Geometry::convex_hull(out.points);
+//}
+//TEST_CASE("Convex polygon intersection test on random polygons", "[Geometry]") {
+//    constexpr size_t TEST_CNT = 1000;
+//    constexpr size_t POINT_CNT = 1000;
+
+//    auto seed = std::random_device{}();
+////    unsigned long seed = 2525634386;
+//    std::mt19937_64 rg{seed};
+//    Benchmark bench;
+
+//    auto tests = reserve_vector<std::pair<Polygon, Polygon>>(TEST_CNT);
+//    auto results = reserve_vector<bool>(TEST_CNT);
+//    auto expects = reserve_vector<bool>(TEST_CNT);
+
+//    for (size_t i = 0; i < TEST_CNT; ++i) {
+//        tests.emplace_back(gen_convex_poly(rg, POINT_CNT), gen_convex_poly(rg, POINT_CNT));
+//    }
+
+//    bench.start();
+//    for (const auto &test : tests)
+//        results.emplace_back(Geometry::intersects(test.first, test.second));
+//    bench.stop();
+
+//    std::cout << "Test time: " << bench.getElapsedSec() << std::endl;
+
+//    bench.start();
+//    for (const auto &test : tests)
+//        expects.emplace_back(!intersection(test.first, test.second).empty());
+//    bench.stop();
+
+//    std::cout << "Clipper time: " << bench.getElapsedSec() << std::endl;
+
+//    REQUIRE(results.size() == expects.size());
+
+//    auto seedstr = std::to_string(seed);
+//    for (size_t i = 0; i < results.size(); ++i) {
+//        // std::cout << expects[i] << " ";
+
+//        if (results[i] != expects[i]) {
+//            SVG svg{std::string("fail_seed") + seedstr + "_" + std::to_string(i) + ".svg"};
+//            svg.draw(tests[i].first, "blue");
+//            svg.draw(tests[i].second, "green");
+//            svg.Close();
+
+//            // std::cout << std::endl;
+//        }
+//        REQUIRE(results[i] == expects[i]);
+//    }
+//    std::cout << std::endl;
+
+//}
+
+struct Pair
+{
+    size_t first, second;
+    bool operator==(const Pair &b) const { return first == b.first && second == b.second; }
+};
+
+template<> struct std::hash<Pair> {
+    size_t operator()(const Pair &c) const
+    {
+        return c.first * PRINTER_PART_POLYGONS.size() + c.second;
+    }
+};
+
+TEST_CASE("Convex polygon intersection test prusa polygons", "[Geometry][Rotcalip]") {
+
+    // Overlap of the same polygon should always be an intersection
+    for (size_t i = 0; i < PRINTER_PART_POLYGONS.size(); ++i) {
+        Polygon P = PRINTER_PART_POLYGONS[i];
+        P = Geometry::convex_hull(P.points);
+        bool res = Geometry::intersects(P, P);
+        if (!res) {
+            SVG svg{std::string("fail_self") + std::to_string(i) + ".svg"};
+            svg.draw(P, "green");
+            svg.Close();
+        }
+        REQUIRE(res == true);
+    }
+
+    std::unordered_set<Pair> combos;
+    for (size_t i = 0; i < PRINTER_PART_POLYGONS.size(); ++i) {
+        for (size_t j = 0; j < PRINTER_PART_POLYGONS.size(); ++j) {
+            if (i != j) {
+                size_t a = std::min(i, j), b = std::max(i, j);
+                combos.insert(Pair{a, b});
+            }
+        }
+    }
+
+    // All disjoint
+    for (const auto &combo : combos) {
+        Polygon A = PRINTER_PART_POLYGONS[combo.first], B = PRINTER_PART_POLYGONS[combo.second];
+        A = Geometry::convex_hull(A.points);
+        B = Geometry::convex_hull(B.points);
+
+        auto bba = A.bounding_box();
+        auto bbb = B.bounding_box();
+
+        A.translate(-bba.center());
+        B.translate(-bbb.center());
+
+        B.translate(bba.size() + bbb.size());
+
+        bool res = Geometry::intersects(A, B);
+        bool ref = !intersection(A, B).empty();
+
+        if (res != ref) {
+            SVG svg{std::string("fail") + std::to_string(combo.first) + "_" + std::to_string(combo.second) + ".svg"};
+            svg.draw(A, "blue");
+            svg.draw(B, "green");
+            svg.Close();
+        }
+
+        REQUIRE(res == ref);
+    }
+
+    // All intersecting
+    for (const auto &combo : combos) {
+        Polygon A = PRINTER_PART_POLYGONS[combo.first], B = PRINTER_PART_POLYGONS[combo.second];
+        A = Geometry::convex_hull(A.points);
+        B = Geometry::convex_hull(B.points);
+
+        auto bba = A.bounding_box();
+        auto bbb = B.bounding_box();
+
+        A.translate(-bba.center());
+        B.translate(-bbb.center());
+
+        bool res = Geometry::intersects(A, B);
+        bool ref = !intersection(A, B).empty();
+
+        if (res != ref) {
+            SVG svg{std::string("fail") + std::to_string(combo.first) + "_" + std::to_string(combo.second) + ".svg"};
+            svg.draw(A, "blue");
+            svg.draw(B, "green");
+            svg.Close();
+        }
+
+        REQUIRE(res == ref);
+    }
+}
diff --git a/tests/libslic3r/test_hollowing.cpp b/tests/libslic3r/test_hollowing.cpp
index 1f5ca3845..ad4f8f296 100644
--- a/tests/libslic3r/test_hollowing.cpp
+++ b/tests/libslic3r/test_hollowing.cpp
@@ -13,7 +13,6 @@ TEST_CASE("Hollow two overlapping spheres") {
     sphere2.translate( 5.f, 0.f, 0.f);
 
     sphere1.merge(sphere2);
-    sphere1.require_shared_vertices();
 
     sla::hollow_mesh(sphere1, sla::HollowingConfig{}, sla::HollowingFlags::hfRemoveInsideTriangles);
 
diff --git a/tests/libslic3r/test_marchingsquares.cpp b/tests/libslic3r/test_marchingsquares.cpp
index a0b27f6d8..3553697ac 100644
--- a/tests/libslic3r/test_marchingsquares.cpp
+++ b/tests/libslic3r/test_marchingsquares.cpp
@@ -319,7 +319,6 @@ static void recreate_object_from_rasters(const std::string &objname, float lh) {
     mesh.translate(tr.x(), tr.y(), tr.z());
     bb = mesh.bounding_box();
     
-    assert(mesh.has_shared_vertices());
     std::vector<ExPolygons> layers = slice_mesh_ex(mesh.its, grid(float(bb.min.z()) + lh, float(bb.max.z()), lh));
     
     sla::RasterBase::Resolution res{2560, 1440};
diff --git a/tests/sla_print/sla_print_tests.cpp b/tests/sla_print/sla_print_tests.cpp
index d26d6e2a2..db8c5e93e 100644
--- a/tests/sla_print/sla_print_tests.cpp
+++ b/tests/sla_print/sla_print_tests.cpp
@@ -57,7 +57,6 @@ TEST_CASE("Support point generator should be deterministic if seeded",
     auto   layer_h = 0.05f;
     
     auto slicegrid = grid(float(gnd), float(zmax), layer_h);
-    assert(mesh.has_shared_vertices());
     std::vector<ExPolygons> slices = slice_mesh_ex(mesh.its, slicegrid, CLOSING_RADIUS);
     
     point_gen.seed(0);
diff --git a/tests/sla_print/sla_raycast_tests.cpp b/tests/sla_print/sla_raycast_tests.cpp
index b56909280..a69e09412 100644
--- a/tests/sla_print/sla_raycast_tests.cpp
+++ b/tests/sla_print/sla_raycast_tests.cpp
@@ -63,7 +63,6 @@ TEST_CASE("Raycaster with loaded drillholes", "[sla_raycast]")
     sla::DrainHoles holes = { sla::DrainHole{p, normal, radius, hole_length} };
     
     cube.merge(*cube_inside);
-    cube.require_shared_vertices();
     
     sla::IndexedMesh emesh{cube};
     emesh.load_holes(holes);
diff --git a/tests/sla_print/sla_supptgen_tests.cpp b/tests/sla_print/sla_supptgen_tests.cpp
index e160504de..f2cf7e834 100644
--- a/tests/sla_print/sla_supptgen_tests.cpp
+++ b/tests/sla_print/sla_supptgen_tests.cpp
@@ -13,7 +13,6 @@ TEST_CASE("Overhanging point should be supported", "[SupGen]") {
     // Pyramid with 45 deg slope
     TriangleMesh mesh = make_pyramid(10.f, 10.f);
     mesh.rotate_y(float(PI));
-    mesh.require_shared_vertices();
     mesh.WriteOBJFile("Pyramid.obj");
 
     sla::SupportPoints pts = calc_support_pts(mesh);
@@ -56,7 +55,6 @@ TEST_CASE("Overhanging horizontal surface should be supported", "[SupGen]") {
 
     TriangleMesh mesh = make_cube(width, depth, height);
     mesh.translate(0., 0., 5.); // lift up
-    mesh.require_shared_vertices();
     mesh.WriteOBJFile("Cuboid.obj");
 
     sla::SupportPointGenerator::Config cfg;
@@ -83,7 +81,6 @@ TEST_CASE("Overhanging edge should be supported", "[SupGen]") {
     TriangleMesh mesh = make_prism(width, depth, height);
     mesh.rotate_y(float(PI)); // rotate on its back
     mesh.translate(0., 0., height);
-    mesh.require_shared_vertices();
     mesh.WriteOBJFile("Prism.obj");
 
     sla::SupportPointGenerator::Config cfg;
@@ -115,7 +112,6 @@ TEST_CASE("Hollowed cube should be supported from the inside", "[SupGen][Hollowe
     auto h  = float(bb.max.z() - bb.min.z());
     Vec3f mv = bb.center().cast<float>() - Vec3f{0.f, 0.f, 0.5f * h};
     mesh.translate(-mv);
-    mesh.require_shared_vertices();
 
     sla::SupportPointGenerator::Config cfg;
     sla::SupportPoints pts = calc_support_pts(mesh, cfg);
@@ -132,7 +128,6 @@ TEST_CASE("Two parallel plates should be supported", "[SupGen][Hollowed]")
     TriangleMesh mesh_high = center_around_bb(make_cube(width, depth, height));
     mesh_high.translate(0., 0., 10.); // lift up
     mesh.merge(mesh_high);
-    mesh.require_shared_vertices();
 
     mesh.WriteOBJFile("parallel_plates.obj");
 
diff --git a/tests/sla_print/sla_test_utils.cpp b/tests/sla_print/sla_test_utils.cpp
index be9bf9741..1082df200 100644
--- a/tests/sla_print/sla_test_utils.cpp
+++ b/tests/sla_print/sla_test_utils.cpp
@@ -74,8 +74,6 @@ void export_failed_case(const std::vector<ExPolygons> &support_slices, const Sup
     byproducts.supporttree.retrieve_full_mesh(its);
     TriangleMesh m{its};
     m.merge(byproducts.input_mesh);
-    m.repair();
-    m.require_shared_vertices();
     m.WriteOBJFile((Catch::getResultCapture().getCurrentTestName() + "_" +
                     byproducts.obj_fname).c_str());
 }
@@ -95,7 +93,6 @@ void test_supports(const std::string          &obj_filename,
         sla::InteriorPtr interior = sla::generate_interior(mesh, hollowingcfg);
         REQUIRE(interior);
         mesh.merge(TriangleMesh{sla::get_mesh(*interior)});
-        mesh.require_shared_vertices();
     }
     
     auto   bb      = mesh.bounding_box();
@@ -105,7 +102,6 @@ void test_supports(const std::string          &obj_filename,
     auto   layer_h = 0.05f;
     
     out.slicegrid = grid(float(gnd), float(zmax), layer_h);
-    assert(mesh.has_shared_vertices());
     out.model_slices = slice_mesh_ex(mesh.its, out.slicegrid, CLOSING_RADIUS);
     sla::cut_drainholes(out.model_slices, out.slicegrid, CLOSING_RADIUS, drainholes, []{});
     
@@ -283,8 +279,10 @@ void test_concave_hull(const ExPolygons &polys) {
     _test_concave_hull(waffl, polys);
 }
 
+//FIXME this functionality is gone after TriangleMesh refactoring to get rid of admesh.
 void check_validity(const TriangleMesh &input_mesh, int flags)
 {
+    /*
     TriangleMesh mesh{input_mesh};
     
     if (flags & ASSUME_NO_EMPTY) {
@@ -292,20 +290,18 @@ void check_validity(const TriangleMesh &input_mesh, int flags)
     } else if (mesh.empty())
         return; // If it can be empty and it is, there is nothing left to do.
     
-    REQUIRE(stl_validate(&mesh.stl));
-    
     bool do_update_shared_vertices = false;
     mesh.repair(do_update_shared_vertices);
     
     if (flags & ASSUME_NO_REPAIR) {
-        REQUIRE_FALSE(mesh.needed_repair());
+        REQUIRE_FALSE(mesh.repaired());
     }
     
     if (flags & ASSUME_MANIFOLD) {
-        mesh.require_shared_vertices();
         if (!mesh.is_manifold()) mesh.WriteOBJFile("non_manifold.obj");
         REQUIRE(mesh.is_manifold());
     }
+    */
 }
 
 void check_raster_transformations(sla::RasterBase::Orientation o, sla::RasterBase::TMirroring mirroring)
@@ -420,53 +416,6 @@ double predict_error(const ExPolygon &p, const sla::RasterBase::PixelDim &pd)
     return error;
 }
 
-
-// Make a 3D pyramid
-TriangleMesh make_pyramid(float base, float height)
-{
-    float a = base / 2.f;
-
-    TriangleMesh mesh(
-        {
-            {-a, -a, 0}, {a, -a, 0}, {a, a, 0},
-            {-a, a, 0}, {0.f, 0.f, height}
-        },
-        {
-            {0, 1, 2},
-            {0, 2, 3},
-            {0, 1, 4},
-            {1, 2, 4},
-            {2, 3, 4},
-            {3, 0, 4}
-        });
-
-    mesh.repair();
-
-    return mesh;
-}
-
-    TriangleMesh make_prism(double width, double length, double height)
-{
-    // We need two upward facing triangles
-
-        double x = width / 2., y = length / 2.;
-
-        TriangleMesh mesh(
-            {
-                {-x, -y, 0.}, {x, -y, 0.}, {0., -y, height},
-                {-x, y, 0.}, {x, y, 0.}, {0., y, height},
-                },
-            {
-                {0, 1, 2}, // side 1
-                {4, 3, 5}, // side 2
-                {1, 4, 2}, {2, 4, 5}, // roof 1
-                {0, 2, 5}, {0, 5, 3}, // roof 2
-                {3, 4, 1}, {3, 1, 0} // bottom
-            });
-
-    return mesh;
-}
-
 sla::SupportPoints calc_support_pts(
     const TriangleMesh &                      mesh,
     const sla::SupportPointGenerator::Config &cfg)
@@ -474,7 +423,6 @@ sla::SupportPoints calc_support_pts(
     // Prepare the slice grid and the slices
     auto                    bb      = cast<float>(mesh.bounding_box());
     std::vector<float>      heights = grid(bb.min.z(), bb.max.z(), 0.1f);
-    assert(mesh.has_shared_vertices());
     std::vector<ExPolygons> slices  = slice_mesh_ex(mesh.its, heights, CLOSING_RADIUS);
 
     // Prepare the support point calculator
diff --git a/tests/sla_print/sla_test_utils.hpp b/tests/sla_print/sla_test_utils.hpp
index d10a85b25..2264ad856 100644
--- a/tests/sla_print/sla_test_utils.hpp
+++ b/tests/sla_print/sla_test_utils.hpp
@@ -185,11 +185,6 @@ long raster_pxsum(const sla::RasterGrayscaleAA &raster);
 
 double predict_error(const ExPolygon &p, const sla::RasterBase::PixelDim &pd);
 
-// Make a 3D pyramid
-TriangleMesh make_pyramid(float base, float height);
-
-TriangleMesh make_prism(double width, double length, double height);
-
 sla::SupportPoints calc_support_pts(
     const TriangleMesh &                      mesh,
     const sla::SupportPointGenerator::Config &cfg = {});
diff --git a/version.inc b/version.inc
index d981d620a..fdbc2523f 100644
--- a/version.inc
+++ b/version.inc
@@ -3,7 +3,7 @@
 
 set(SLIC3R_APP_NAME "PrusaSlicer")
 set(SLIC3R_APP_KEY "PrusaSlicer")
-set(SLIC3R_VERSION "2.4.0-alpha1")
+set(SLIC3R_VERSION "2.4.0-alpha3")
 set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
 set(SLIC3R_RC_VERSION "2,4,0,0")
 set(SLIC3R_RC_VERSION_DOTS "2.4.0.0")
diff --git a/xs/t/01_trianglemesh.t b/xs/t/01_trianglemesh.t
index 4013a1f83..453cc9218 100644
--- a/xs/t/01_trianglemesh.t
+++ b/xs/t/01_trianglemesh.t
@@ -4,10 +4,7 @@ use strict;
 use warnings;
 
 use Slic3r::XS;
-use Test::More tests => 49;
-
-is Slic3r::TriangleMesh::hello_world(), 'Hello world!',
-    'hello world';
+use Test::More tests => 5;
 
 my $cube = {
     vertices    => [ [20,20,0], [20,0,0], [0,0,0], [0,20,0], [20,20,20], [0,20,20], [0,0,20], [20,0,20] ],
@@ -17,12 +14,10 @@ my $cube = {
 {
     my $m = Slic3r::TriangleMesh->new;
     $m->ReadFromPerl($cube->{vertices}, $cube->{facets});
-    $m->repair;
     my ($vertices, $facets) = ($m->vertices, $m->facets);
     
     is_deeply $vertices, $cube->{vertices}, 'vertices arrayref roundtrip';
     is_deeply $facets, $cube->{facets}, 'facets arrayref roundtrip';
-    is scalar(@{$m->normals}), scalar(@$facets), 'normals returns the right number of items';
     
     {
         my $m2 = $m->clone;
@@ -34,109 +29,6 @@ my $cube = {
     {
         my $stats = $m->stats;
         is $stats->{number_of_facets}, scalar(@{ $cube->{facets} }), 'stats.number_of_facets';
-        ok abs($stats->{volume} - 20*20*20) < 1E-2, 'stats.volume';
-    }
-    
-    $m->scale(2);
-    ok abs($m->stats->{volume} - 40*40*40) < 1E-2, 'scale';
-    
-    $m->scale_xyz(Slic3r::Pointf3->new(2,1,1));
-    ok abs($m->stats->{volume} - 2*40*40*40) < 1E-2, 'scale_xyz';
-    
-    $m->translate(5,10,0);
-    is_deeply $m->vertices->[0], [85,50,0], 'translate';
-    
-    $m->align_to_origin;
-    is_deeply $m->vertices->[2], [0,0,0], 'align_to_origin';
-    
-    is_deeply $m->size, [80,40,40], 'size';
-    
-    $m->scale_xyz(Slic3r::Pointf3->new(0.5,1,1));
-    $m->rotate(45, Slic3r::Point->new(20,20));
-    ok abs($m->size->[0] - sqrt(2)*40) < 1E-4, 'rotate';
-    
-    {
-        my $meshes = $m->split;
-        is scalar(@$meshes), 1, 'split';
-        isa_ok $meshes->[0], 'Slic3r::TriangleMesh', 'split';
-        is_deeply $m->bb3, $meshes->[0]->bb3, 'split populates stats';
-    }
-    
-    my $m2 = Slic3r::TriangleMesh->new;
-    $m2->ReadFromPerl($cube->{vertices}, $cube->{facets});
-    $m2->repair;
-    $m->merge($m2);
-    $m->repair;
-    is $m->stats->{number_of_facets}, 2 * $m2->stats->{number_of_facets}, 'merge';
-    
-    {
-        my $meshes = $m->split;
-        is scalar(@$meshes), 2, 'split';
-    }
-}
-
-{
-    my $m = Slic3r::TriangleMesh->new;
-    $m->ReadFromPerl($cube->{vertices}, $cube->{facets});
-    $m->repair;
-    # The slice at zero height does not belong to the mesh, the slicing considers the vertical structures to be
-    # open intervals at the bottom end, closed at the top end.
-    my @z = (0.0001,2,4,8,6,8,10,12,14,16,18,20);
-    my $result = $m->slice(\@z);
-    my $SCALING_FACTOR = 0.000001;
-    for my $i (0..$#z) {
-        is scalar(@{$result->[$i]}), 1, "number of returned polygons per layer (z = " . $z[$i] . ")";
-        is $result->[$i][0]->area, 20*20/($SCALING_FACTOR**2), 'size of returned polygon';
-    }
-}
-
-{
-    my $m = Slic3r::TriangleMesh->new;
-    $m->ReadFromPerl(
-        [ [0,0,0],[0,0,20],[0,5,0],[0,5,20],[50,0,0],[50,0,20],[15,5,0],[35,5,0],[15,20,0],[50,5,0],[35,20,0],[15,5,10],[50,5,20],[35,5,10],[35,20,10],[15,20,10] ],
-        [ [0,1,2],[2,1,3],[1,0,4],[5,1,4],[0,2,4],[4,2,6],[7,6,8],[4,6,7],[9,4,7],[7,8,10],[2,3,6],[11,3,12],[7,12,9],[13,12,7],[6,3,11],[11,12,13],[3,1,5],[12,3,5],[5,4,9],[12,5,9],[13,7,10],[14,13,10],[8,15,10],[10,15,14],[6,11,8],[8,11,15],[15,11,13],[14,15,13] ],
-    );
-    $m->repair;
-    {
-        # at Z = 10 we have a top horizontal surface
-        my $slices = $m->slice([ 5, 10 ]);
-        is $slices->[0][0]->area, $slices->[1][0]->area, 'slicing a top tangent plane includes its area';
-    }
-    $m->mirror_z;
-    {
-        # this second test also checks that performing a second slice on a mesh after
-        # a transformation works properly (shared_vertices is correctly invalidated);
-        # at Z = -10 we have a bottom horizontal surface
-        # (The slice at zero height does not belong to the mesh, the slicing considers the vertical structures to be
-        #  open intervals at the bottom end, closed at the top end, so the Z = -10 is shifted a bit up to get a valid slice).
-        my $slices = $m->slice([ -5, -10+0.00001 ]);
-        is $slices->[0][0]->area, $slices->[1][0]->area, 'slicing a bottom tangent plane includes its area';
-    }
-}
-
-{
-    my $m = Slic3r::TriangleMesh->new;
-    $m->ReadFromPerl($cube->{vertices}, $cube->{facets});
-    $m->repair;
-    {
-        my $upper = Slic3r::TriangleMesh->new;
-        my $lower = Slic3r::TriangleMesh->new;
-        $m->cut(0, $upper, $lower);
-        $upper->repair; $lower->repair;
-        is $upper->facets_count, 12, 'upper mesh has all facets except those belonging to the slicing plane';
-        is $lower->facets_count,  0, 'lower mesh has no facets';
-    }
-    {
-        my $upper = Slic3r::TriangleMesh->new;
-        my $lower = Slic3r::TriangleMesh->new;
-        $m->cut(10, $upper, $lower);
-        #$upper->repair; $lower->repair;
-        # we expect:
-        # 2 facets on external horizontal surfaces
-        # 3 facets on each side = 12 facets
-        # 6 facets on the triangulated side (8 vertices)
-        is $upper->facets_count, 2+12+6, 'upper mesh has the expected number of facets';
-        is $lower->facets_count, 2+12+6, 'lower mesh has the expected number of facets';
     }
 }
 
diff --git a/xs/xsp/Model.xsp b/xs/xsp/Model.xsp
index e7a171efd..34795681e 100644
--- a/xs/xsp/Model.xsp
+++ b/xs/xsp/Model.xsp
@@ -10,7 +10,6 @@
 #include "libslic3r/Format/AMF.hpp"
 #include "libslic3r/Format/3mf.hpp"
 #include "libslic3r/Format/OBJ.hpp"
-#include "libslic3r/Format/PRUS.hpp"
 #include "libslic3r/Format/STL.hpp"
 #include "libslic3r/PresetBundle.hpp"
 %}
@@ -89,8 +88,6 @@
     bool looks_like_multipart_object() const;
     void convert_multipart_object(unsigned int max_extruders);
 
-    void print_info() const;
-
     bool store_stl(char *path, bool binary)
         %code%{ TriangleMesh mesh = THIS->mesh(); RETVAL = Slic3r::store_stl(path, &mesh, binary); %};
 
@@ -213,7 +210,6 @@ ModelMaterial::attributes()
         %code%{ THIS->origin_translation = *point; %};
     
     void ensure_on_bed();
-    bool needed_repair() const;
     int materials_count() const;
     int facets_count();
     void center_around_origin();
@@ -224,13 +220,6 @@ ModelMaterial::attributes()
         %code{% THIS->rotate(angle, *axis); %};
     void mirror(Axis axis);
 
-    ModelObjectPtrs* split_object()
-        %code%{
-            RETVAL = new ModelObjectPtrs();  // leak?
-            THIS->split(RETVAL);
-        %};
-
-    void print_info() const;
 };
 
 
diff --git a/xs/xsp/TriangleMesh.xsp b/xs/xsp/TriangleMesh.xsp
index 2b07c78ee..a9dbe654d 100644
--- a/xs/xsp/TriangleMesh.xsp
+++ b/xs/xsp/TriangleMesh.xsp
@@ -11,14 +11,11 @@
     ~TriangleMesh();
     Clone<TriangleMesh> clone()
         %code{% RETVAL = THIS; %};
-    void ReadSTLFile(char* input_file);
     void write_ascii(char* output_file);
     void write_binary(char* output_file);
-    void repair();
-    void WriteOBJFile(char* output_file);
     void scale(float factor);
     void scale_xyz(Vec3d* versor)
-        %code{% THIS->scale(*versor); %};
+        %code{% THIS->scale(versor->cast<float>()); %};
     void translate(float x, float y, float z);
     void rotate_x(float angle);
     void rotate_y(float angle);
@@ -28,16 +25,13 @@
     void mirror_z();
     void align_to_origin();
     void rotate(double angle, Point* center);
-    TriangleMeshPtrs split();
     void merge(TriangleMesh* mesh)
         %code{% THIS->merge(*mesh); %};
-    ExPolygons horizontal_projection();
     Clone<Polygon> convex_hull();
     Clone<BoundingBoxf3> bounding_box();
     Clone<Vec3d> center()
         %code{% RETVAL = THIS->bounding_box().center(); %};
     int facets_count();
-    void reset_repair_stats();
 
 %{
 
@@ -46,51 +40,40 @@ TriangleMesh::ReadFromPerl(vertices, facets)
     SV* vertices
     SV* facets
     CODE:
-        stl_file &stl = THIS->stl;
-        stl.stats.type = inmemory;
-    
-        // count facets and allocate memory
-        AV* facets_av = (AV*)SvRV(facets);
-        stl.stats.number_of_facets = av_len(facets_av)+1;
-        stl.stats.original_num_facets = stl.stats.number_of_facets;
-        stl_allocate(&stl);
-    
-        // read geometry
-        AV* vertices_av = (AV*)SvRV(vertices);
-        for (int i = 0; i < stl.stats.number_of_facets; i++) {
-            AV* facet_av = (AV*)SvRV(*av_fetch(facets_av, i, 0));
-            stl_facet facet;
-            facet.normal(0) = 0;
-            facet.normal(1) = 0;
-            facet.normal(2) = 0;
-            for (unsigned int v = 0; v <= 2; v++) {
-                AV* vertex_av = (AV*)SvRV(*av_fetch(vertices_av, SvIV(*av_fetch(facet_av, v, 0)), 0));
-                facet.vertex[v](0) = SvNV(*av_fetch(vertex_av, 0, 0));
-                facet.vertex[v](1) = SvNV(*av_fetch(vertex_av, 1, 0));
-                facet.vertex[v](2) = SvNV(*av_fetch(vertex_av, 2, 0));
+        std::vector<Slic3r::Vec3f> out_vertices;
+        {
+            AV* vertices_av = (AV*)SvRV(vertices);
+            int number_of_vertices = av_len(vertices_av) + 1;
+            out_vertices.reserve(number_of_vertices);
+            for (int i = 0; i < number_of_vertices; ++ i) {
+                AV* vertex_av = (AV*)SvRV(*av_fetch(vertices_av, i, 0));
+                out_vertices.push_back(Slic3r::Vec3f(SvNV(*av_fetch(vertex_av, 0, 0)), SvNV(*av_fetch(vertex_av, 1, 0)), SvNV(*av_fetch(vertex_av, 2, 0))));
             }
-            facet.extra[0] = 0;
-            facet.extra[1] = 0;
-        
-            stl.facet_start[i] = facet;
         }
-    
-        stl_get_size(&stl);
+        std::vector<Slic3r::Vec3i> out_indices;
+        {
+            AV* facets_av = (AV*)SvRV(facets);
+            int number_of_facets = av_len(facets_av) + 1;
+            out_indices.reserve(number_of_facets);
+            for (int i = 0; i < number_of_facets; ++ i) {
+                AV* facet_av = (AV*)SvRV(*av_fetch(facets_av, i, 0));
+                out_indices.push_back(Slic3r::Vec3i(SvIV(*av_fetch(facet_av, 0, 0)), SvIV(*av_fetch(facet_av, 1, 0)), SvIV(*av_fetch(facet_av, 2, 0))));
+            }
+        }
+        *THIS = TriangleMesh(std::move(out_vertices), std::move(out_indices));
 
 SV*
 TriangleMesh::stats()
     CODE:
         HV* hv = newHV();
-        (void)hv_stores( hv, "number_of_facets",    newSViv(THIS->stl.stats.number_of_facets) );
-        (void)hv_stores( hv, "number_of_parts",     newSViv(THIS->stl.stats.number_of_parts) );
-        (void)hv_stores( hv, "volume",              newSVnv(THIS->stl.stats.volume) );
-        (void)hv_stores( hv, "degenerate_facets",   newSViv(THIS->stl.stats.degenerate_facets) );
-        (void)hv_stores( hv, "edges_fixed",         newSViv(THIS->stl.stats.edges_fixed) );
-        (void)hv_stores( hv, "facets_removed",      newSViv(THIS->stl.stats.facets_removed) );
-        (void)hv_stores( hv, "facets_added",        newSViv(THIS->stl.stats.facets_added) );
-        (void)hv_stores( hv, "facets_reversed",     newSViv(THIS->stl.stats.facets_reversed) );
-        (void)hv_stores( hv, "backwards_edges",     newSViv(THIS->stl.stats.backwards_edges) );
-        (void)hv_stores( hv, "normals_fixed",       newSViv(THIS->stl.stats.normals_fixed) );
+        (void)hv_stores( hv, "number_of_facets",    newSViv(THIS->facets_count()) );
+        (void)hv_stores( hv, "number_of_parts",     newSViv(THIS->stats().number_of_parts) );
+        (void)hv_stores( hv, "volume",              newSVnv(THIS->stats().volume) );
+        (void)hv_stores( hv, "degenerate_facets",   newSViv(THIS->stats().repaired_errors.degenerate_facets) );
+        (void)hv_stores( hv, "edges_fixed",         newSViv(THIS->stats().repaired_errors.edges_fixed) );
+        (void)hv_stores( hv, "facets_removed",      newSViv(THIS->stats().repaired_errors.facets_removed) );
+        (void)hv_stores( hv, "facets_reversed",     newSViv(THIS->stats().repaired_errors.facets_reversed) );
+        (void)hv_stores( hv, "backwards_edges",     newSViv(THIS->stats().repaired_errors.backwards_edges) );
         RETVAL = (SV*)newRV_noinc((SV*)hv);
     OUTPUT:
         RETVAL
@@ -98,9 +81,6 @@ TriangleMesh::stats()
 SV*
 TriangleMesh::vertices()
     CODE:
-        if (!THIS->repaired) CONFESS("vertices() requires repair()");
-        THIS->require_shared_vertices();
-        
         // vertices
         AV* vertices = newAV();
         av_extend(vertices, THIS->its.vertices.size());
@@ -120,13 +100,10 @@ TriangleMesh::vertices()
 SV*
 TriangleMesh::facets()
     CODE:
-        if (!THIS->repaired) CONFESS("facets() requires repair()");
-        THIS->require_shared_vertices();
-        
         // facets
         AV* facets = newAV();
-        av_extend(facets, THIS->stl.stats.number_of_facets);
-        for (int i = 0; i < THIS->stl.stats.number_of_facets; i++) {
+        av_extend(facets, THIS->facets_count());
+        for (int i = 0; i < THIS->facets_count(); i++) {
             AV* facet = newAV();
             av_store(facets, i, newRV_noinc((SV*)facet));
             av_extend(facet, 2);
@@ -139,35 +116,14 @@ TriangleMesh::facets()
     OUTPUT:
         RETVAL
 
-SV*
-TriangleMesh::normals()
-    CODE:
-        if (!THIS->repaired) CONFESS("normals() requires repair()");
-        
-        // normals
-        AV* normals = newAV();
-        av_extend(normals, THIS->stl.stats.number_of_facets);
-        for (int i = 0; i < THIS->stl.stats.number_of_facets; i++) {
-            AV* facet = newAV();
-            av_store(normals, i, newRV_noinc((SV*)facet));
-            av_extend(facet, 2);
-            av_store(facet, 0, newSVnv(THIS->stl.facet_start[i].normal(0)));
-            av_store(facet, 1, newSVnv(THIS->stl.facet_start[i].normal(1)));
-            av_store(facet, 2, newSVnv(THIS->stl.facet_start[i].normal(2)));
-        }
-        
-        RETVAL = newRV_noinc((SV*)normals);
-    OUTPUT:
-        RETVAL
-
 SV*
 TriangleMesh::size()
     CODE:
         AV* size = newAV();
         av_extend(size, 2);
-        av_store(size, 0, newSVnv(THIS->stl.stats.size(0)));
-        av_store(size, 1, newSVnv(THIS->stl.stats.size(1)));
-        av_store(size, 2, newSVnv(THIS->stl.stats.size(2)));
+        av_store(size, 0, newSVnv(THIS->stats().size(0)));
+        av_store(size, 1, newSVnv(THIS->stats().size(1)));
+        av_store(size, 2, newSVnv(THIS->stats().size(2)));
         RETVAL = newRV_noinc((SV*)size);
     OUTPUT:
         RETVAL
@@ -176,8 +132,6 @@ SV*
 TriangleMesh::slice(z)
     std::vector<double> z
     CODE:
-        THIS->require_shared_vertices(); // TriangleMeshSlicer needs this
-
         // convert doubles to floats
         std::vector<float> z_f = cast<float>(z);
         
@@ -206,7 +160,6 @@ TriangleMesh::cut(z, upper_mesh, lower_mesh)
     TriangleMesh*   upper_mesh;
     TriangleMesh*   lower_mesh;
     CODE:
-        THIS->require_shared_vertices(); // TriangleMeshSlicer needs this
         indexed_triangle_set upper, lower;
         cut_mesh(THIS->its, z, upper_mesh ? &upper : nullptr, lower_mesh ? &lower : nullptr);
         if (upper_mesh)
@@ -217,12 +170,12 @@ TriangleMesh::cut(z, upper_mesh, lower_mesh)
 std::vector<double>
 TriangleMesh::bb3()
     CODE:
-        RETVAL.push_back(THIS->stl.stats.min(0));
-        RETVAL.push_back(THIS->stl.stats.min(1));
-        RETVAL.push_back(THIS->stl.stats.max(0));
-        RETVAL.push_back(THIS->stl.stats.max(1));
-        RETVAL.push_back(THIS->stl.stats.min(2));
-        RETVAL.push_back(THIS->stl.stats.max(2));
+        RETVAL.push_back(THIS->stats().min(0));
+        RETVAL.push_back(THIS->stats().min(1));
+        RETVAL.push_back(THIS->stats().max(0));
+        RETVAL.push_back(THIS->stats().max(1));
+        RETVAL.push_back(THIS->stats().min(2));
+        RETVAL.push_back(THIS->stats().max(2));
     OUTPUT:
         RETVAL
 
@@ -250,16 +203,3 @@ sphere(double rho)
 
 %}
 };
-
-%package{Slic3r::TriangleMesh};
-
-%{
-PROTOTYPES: DISABLE
-
-std::string
-hello_world()
-  CODE:
-    RETVAL = "Hello world!";
-  OUTPUT:
-    RETVAL
-%}
diff --git a/xs/xsp/my.map b/xs/xsp/my.map
index 54e686ae3..ca26750dc 100644
--- a/xs/xsp/my.map
+++ b/xs/xsp/my.map
@@ -239,7 +239,6 @@ SupportLayerPtrs*   T_PTR_ARRAYREF_PTR
 # we return these types whenever we want the items to be returned
 # by reference and not marked ::Ref because they're newly allocated
 # and not referenced by any Perl object
-TriangleMeshPtrs T_PTR_ARRAYREF
 
 
 INPUT
diff --git a/xs/xsp/typemap.xspt b/xs/xsp/typemap.xspt
index 2d364628e..f9e61c6a0 100644
--- a/xs/xsp/typemap.xspt
+++ b/xs/xsp/typemap.xspt
@@ -163,7 +163,6 @@
 %typemap{Surfaces};
 %typemap{Polygons*};
 %typemap{TriangleMesh*};
-%typemap{TriangleMeshPtrs};
 %typemap{Model*};
 %typemap{Ref<Model>}{simple};
 %typemap{Clone<Model>}{simple};