diff --git a/release/scripts/addons b/release/scripts/addons
index 3e84842ebd3..5f7fba0565a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 3e84842ebd35f33fa0539935b73e7b7de4344a0c
+Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5c4210d5b78..fecc0db5600 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894
+Subproject commit fecc0db5600405a0c14c70120ae279222861ef80
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3d2d544ad7e..0083adb4cc9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10220,7 +10220,6 @@ void BLO_expand_main(void *fdhandle, Main *mainvar)
 							break;
 						case ID_WS:
 							expand_workspace(fd, mainvar, (WorkSpace *)id);
-							break;
 						default:
 							break;
 					}
diff --git a/source/tools b/source/tools
index 870f46b6e3a..11656ebaf7f 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 870f46b6e3abe03c0b9907d08f79af47f4b58ee8
+Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa