diff --git a/Polyline_distance/.clang-format b/Polyline_distance/.clang-format
index c163089e2ec9..4415a6e072c3 100644
--- a/Polyline_distance/.clang-format
+++ b/Polyline_distance/.clang-format
@@ -1,3 +1,4 @@
+# Copyright (c) 2024 Max-Planck-Institute Saarbruecken (Germany), GeometryFactory (France)
 # SPDX-License-Identifier: MIT
 BasedOnStyle: Google
 Language: Cpp
diff --git a/Polyline_distance/include/CGAL/Frechet_distance.h b/Polyline_distance/include/CGAL/Frechet_distance.h
index 156e76a54f08..cf490517c2bf 100644
--- a/Polyline_distance/include/CGAL/Frechet_distance.h
+++ b/Polyline_distance/include/CGAL/Frechet_distance.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h b/Polyline_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h
index 11c8f9c89e37..2dfe9fe4847f 100644
--- a/Polyline_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h
+++ b/Polyline_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance.h
index 9c5414cd1cbb..d6d574a7c168 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance_near_neighbors_ds.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance_near_neighbors_ds.h
index a04200398d72..1e83e819ad04 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance_near_neighbors_ds.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/Frechet_distance_near_neighbors_ds.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/certificate.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/certificate.h
index 08a2624c75ad..f9919a25bd8c 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/certificate.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/certificate.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/curve.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/curve.h
index a226e31e889d..828a9de31c41 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/curve.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/curve.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/filter.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/filter.h
index 13c0ab813697..3bedd12c3e7b 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/filter.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/filter.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light.h
index 127745e268f2..966843356ce6 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light_types.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light_types.h
index 680b3ac80eaa..8f3d756048e8 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light_types.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/frechet_light_types.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/geometry_basics.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/geometry_basics.h
index adddb2c0579f..86c2f45d7a86 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/geometry_basics.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/geometry_basics.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/high_level_predicates.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/high_level_predicates.h
index 39a05dd92770..f9e9c20de2f0 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/high_level_predicates.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/high_level_predicates.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance/internal/id.h b/Polyline_distance/include/CGAL/Polyline_distance/internal/id.h
index 7cce8eace34d..1649049fa12d 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance/internal/id.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance/internal/id.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance_traits_2.h b/Polyline_distance/include/CGAL/Polyline_distance_traits_2.h
index f896dedff5b7..414060901a51 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance_traits_2.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance_traits_2.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance_traits_3.h b/Polyline_distance/include/CGAL/Polyline_distance_traits_3.h
index 539fb897fd86..7cdc921e91cd 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance_traits_3.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance_traits_3.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/Polyline_distance/include/CGAL/Polyline_distance_traits_d.h b/Polyline_distance/include/CGAL/Polyline_distance_traits_d.h
index 26a579762b56..e7acbd75d469 100644
--- a/Polyline_distance/include/CGAL/Polyline_distance_traits_d.h
+++ b/Polyline_distance/include/CGAL/Polyline_distance_traits_d.h
@@ -14,7 +14,7 @@
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : André Nusser <anusser@mpi-inf.mpg.de>
 //                 Marvin Künnemann <marvin@mpi-inf.mpg.de>
diff --git a/cgal.natvis b/cgal.natvis
deleted file mode 100644
index 53abc4520af6..000000000000
--- a/cgal.natvis
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-
-<Type Name="CGAL::Point_3&lt;CGAL::Epick&gt;">
-<DisplayString>{{P3 ( {base.base._Elems[0]}, {base.base._Elems[1]}, {base.base._Elems[2]}) })</DisplayString>
-</Type>
-
-
-
-        <Type Name="CGAL::Point_3&lt;CGAL::Simple_cartesian&lt;double&gt;&gt;">
-
-                <DisplayString>{{P3 ( {base.base._Elems[0]}, {base.base._Elems[1]}, {base.base._Elems[2]}) }}</DisplayString>
-
-        </Type>
-
-        <Type Name="CGAL::Interval_nt&lt;*&gt;">
-
-                <DisplayString>{{INT_NT {-_inf}, {_sup} }}</DisplayString>
-
-        </Type>
-
-        <Type Name="CGAL::Point_3&lt;CGAL::Simple_cartesian&lt;CGAL::Interval_nt&lt;1&gt; &gt; &gt;">
-
-        <DisplayString>{{IC::Point_3 {base.base._Elems[0]._inf} }}</DisplayString>
-
-        </Type>
-
-        <Type Name="CGAL::Surface_mesh&lt;*&gt;">
-
-                <DisplayString>{{ SM {vprops_.parrays_ } }}</DisplayString>
-
-        </Type>
-
-</AutoVisualizer>