diff --git a/release/scripts/addons b/release/scripts/addons
index 5f7fba0565a..e76815171ff 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a
+Subproject commit e76815171ffa0814ee142ae823776304ca6070db
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index fecc0db5600..5c4210d5b78 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit fecc0db5600405a0c14c70120ae279222861ef80
+Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894
diff --git a/source/tools b/source/tools
index 11656ebaf7f..870f46b6e3a 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa
+Subproject commit 870f46b6e3abe03c0b9907d08f79af47f4b58ee8
diff --git a/tests/python/bl_pyapi_idprop.py b/tests/python/bl_pyapi_idprop.py
index 063d68fae20..6b5335d4a8e 100644
--- a/tests/python/bl_pyapi_idprop.py
+++ b/tests/python/bl_pyapi_idprop.py
@@ -15,9 +15,13 @@ class TestHelper:
 
     def setUp(self):
         self._id = bpy.context.scene
-        assert(len(self._id.keys()) == 0)
+        self._removeProperties()
+        assert len(self._id.keys()) == 0
 
     def tearDown(self):
+        self._removeProperties()
+
+    def _removeProperties(self):
         for key in list(self._id.keys()):
             del self._id[key]