diff --git a/cmake/modules/PrecompiledHeader.cmake b/cmake/modules/PrecompiledHeader.cmake
index 2f62a7dbe..7ef80aacf 100644
--- a/cmake/modules/PrecompiledHeader.cmake
+++ b/cmake/modules/PrecompiledHeader.cmake
@@ -52,6 +52,10 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
+# Use the new builtin CMake function if possible or fall back to the old one.
+if (CMAKE_VERSION VERSION_LESS 3.16)
+
 include(CMakeParseArguments)
 
 macro(combine_arguments _variable)
@@ -102,6 +106,10 @@ function(export_all_flags _filename)
 endfunction()
 
 function(add_precompiled_header _target _input)
+
+  message(STATUS "Adding precompiled header ${_input} to target ${_target} with legacy method. "
+                 "Update your cmake instance to use the native PCH functions.")
+
   cmake_parse_arguments(_PCH "FORCEINCLUDE" "SOURCE_CXX;SOURCE_C" "" ${ARGN})
 
   get_filename_component(_input_we ${_input} NAME_WE)
@@ -241,3 +249,21 @@ function(add_precompiled_header _target _input)
     endforeach()
   endif(CMAKE_COMPILER_IS_GNUCXX)
 endfunction()
+
+else ()
+
+function(add_precompiled_header _target _input)
+    message(STATUS "Adding precompiled header ${_input} to target ${_target}.")
+    target_precompile_headers(${_target} PRIVATE ${_input})
+
+    get_target_property(_sources ${_target} SOURCES)
+    list(FILTER _sources INCLUDE REGEX ".*\\.mm?")
+
+    if (_sources)
+        message(STATUS "PCH skipping sources: ${_sources}")
+    endif ()
+
+    set_source_files_properties(${_sources} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+endfunction()
+
+endif (CMAKE_VERSION VERSION_LESS 3.16)
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index f72de7ef3..dad4935b8 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -234,6 +234,7 @@ add_library(libslic3r STATIC
     SLA/Contour3D.cpp
     SLA/EigenMesh3D.hpp
     SLA/Clustering.hpp
+    SLA/ReprojectPointsOnMesh.hpp
 )
 
 if (SLIC3R_STATIC)
diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
new file mode 100644
index 000000000..fa919a117
--- /dev/null
+++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
@@ -0,0 +1,45 @@
+#ifndef REPROJECTPOINTSONMESH_HPP
+#define REPROJECTPOINTSONMESH_HPP
+
+#include "libslic3r/Point.hpp"
+#include "SupportPoint.hpp"
+#include "Hollowing.hpp"
+#include "EigenMesh3D.hpp"
+#include "libslic3r/Model.hpp"
+
+#include <tbb/parallel_for.h>
+
+namespace Slic3r { namespace sla {
+
+template<class Pt> Vec3d pos(const Pt &p) { return p.pos.template cast<double>(); }
+template<class Pt> void pos(Pt &p, const Vec3d &pp) { p.pos = pp.cast<float>(); }
+
+template<class PointType>
+void reproject_support_points(const EigenMesh3D &mesh, std::vector<PointType> &pts)
+{
+    tbb::parallel_for(size_t(0), pts.size(), [&mesh, &pts](size_t idx) {
+        int junk;
+        Vec3d new_pos;
+        mesh.squared_distance(pos(pts[idx]), junk, new_pos);
+        pos(pts[idx], new_pos);
+    });
+}
+
+inline void reproject_points_and_holes(ModelObject *object)
+{
+    bool has_sppoints = !object->sla_support_points.empty();
+    bool has_holes   = !object->sla_drain_holes.empty();
+
+    if (!object || (!has_holes && !has_sppoints)) return;
+
+    EigenMesh3D emesh{object->raw_mesh()};
+
+    if (has_sppoints)
+        reproject_support_points(emesh, object->sla_support_points);
+
+    if (has_holes)
+        reproject_support_points(emesh, object->sla_drain_holes);
+}
+
+}}
+#endif // REPROJECTPOINTSONMESH_HPP
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index a75eed12c..b85fe57f0 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -756,8 +756,11 @@ void GLGizmoFdmSupports::on_set_state()
     }
     if (m_state == Off && m_old_state != Off) { // the gizmo was just turned Off
         // we are actually shutting down
-        m_setting_angle = false;
-        m_parent.use_slope(false);
+        if (m_setting_angle) {
+            m_setting_angle = false;
+            m_parent.use_slope(false);
+        }
+
         wxGetApp().plater()->leave_gizmos_stack();
         {
             Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("FDM gizmo turned off")));
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 4243b6ee8..be5b5b3ab 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -40,6 +40,7 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/SLA/Hollowing.hpp"
 #include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/SLA/ReprojectPointsOnMesh.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/PrintConfig.hpp"
@@ -3146,6 +3147,8 @@ void Plater::priv::reload_from_disk()
                     std::swap(old_model_object->volumes[sel_v.volume_idx], old_model_object->volumes.back());
                     old_model_object->delete_volume(old_model_object->volumes.size() - 1);
                     old_model_object->ensure_on_bed();
+
+                    sla::reproject_points_and_holes(old_model_object);
                 }
             }
         }
@@ -3201,6 +3204,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* =
     Plater::TakeSnapshot snapshot(q, _L("Fix Throught NetFabb"));
 
     fix_model_by_win10_sdk_gui(*model.objects[obj_idx], vol_idx);
+    sla::reproject_points_and_holes(model.objects[obj_idx]);
     this->update();
     this->object_list_changed();
     this->schedule_background_process();