diff --git a/release/datafiles/locale b/release/datafiles/locale
index 07106b58838..8f5a0e027f1 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 07106b588381ef26604934482a6151d9bc26437e
+Subproject commit 8f5a0e027f131104974763d30db36b1a9ffae16a
diff --git a/release/scripts/addons b/release/scripts/addons
index feca8c52897..8ad9de7c1e1 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit feca8c5289794a70bdd375be76fc4bc59d83c96b
+Subproject commit 8ad9de7c1e1022dee907ddce78f4c357111fc09e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f2f4a8b3bfa..26a8b2eadc7 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a
+Subproject commit 26a8b2eadc7abb2a30fac50eb5505aa24daf5785
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 96f2b8c1095..0c9ee61ca19 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -1548,7 +1548,11 @@ void BKE_shrinkwrap_remesh_target_project(Mesh *src_me, Mesh *target_me, Object
   ssmd.shrinkMode = MOD_SHRINKWRAP_ON_SURFACE;
   ssmd.shrinkOpts = MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR | MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR;
   ssmd.keepDist = 0.0f;
-  ssmd.projLimit = target_me->remesh_voxel_size;
+  
+  /* Tolerance value to prevent artifacts on sharp edges of a mesh. 
+   * This constant and based on experimenting with different values. */
+  const float projLimitTolerance = 5.0f;
+  ssmd.projLimit = target_me->remesh_voxel_size * projLimitTolerance;
 
   float(*vertexCos)[3] = BKE_mesh_vert_coords_alloc(src_me, &totvert);
 
diff --git a/source/tools b/source/tools
index 2afbb8ec472..7011d02c292 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit 7011d02c292ac1c91a5c9cc1a075ea2727982cee