diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index 75ae8f906..4c8dc4585 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -33,7 +33,6 @@ ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
 $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
-$oP->add_linked_script("../js/json.js");
 $oP->add_linked_script("../js/forms-json-utils.js");
 $oP->add_linked_script("../js/wizardhelper.js");
 $oP->add_linked_script("../js/wizard.utils.js");
diff --git a/pages/tagadmin.php b/pages/tagadmin.php
index b9f6b4987..9f0aa8c4b 100644
--- a/pages/tagadmin.php
+++ b/pages/tagadmin.php
@@ -37,7 +37,6 @@ try
 	// Main program
 	//
 	$oP = new iTopWebPage(Dict::S('Menu:TagAdminMenu+'));
-	$oP->add_linked_script("../js/json.js");
 	$oP->add_linked_script("../js/forms-json-utils.js");
 	$oP->add_linked_script("../js/wizardhelper.js");
 	$oP->add_linked_script("../js/wizard.utils.js");
diff --git a/sources/Controller/Base/Layout/ObjectController.php b/sources/Controller/Base/Layout/ObjectController.php
index 78c93cb7a..c8c557b54 100644
--- a/sources/Controller/Base/Layout/ObjectController.php
+++ b/sources/Controller/Base/Layout/ObjectController.php
@@ -781,7 +781,6 @@ JS;
 	public static function EnumRequiredForModificationJsFilesRelPaths(): array
 	{
 		return [
-			'js/json.js',
 			'js/forms-json-utils.js',
 			'js/wizardhelper.js',
 			'js/wizard.utils.js',
diff --git a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
index 321610d78..94111d6eb 100644
--- a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
@@ -1356,4 +1356,27 @@ class DBObjectTest extends ItopDataTestCase
 		$oOrganisation->SetTrim('name', $sName);
 		$this->assertEquals($sResult, $oOrganisation->Get('name'), 'SetTrim must limit string to 255 characters');
 	}
+
+	/**
+	 * @covers DBObject::SetComputedDate
+	 * @return void
+	 */
+	public function testSetComputedDateOnAttributeDate(){
+		$oObject = MetaModel::NewObject(\CustomerContract::class, ['name'=>'Test contract','org_id'=>'3','provider_id'=>'2']);
+		$oObject->Set('start_date',time());
+		$oObject->SetComputedDate('end_date', "+2 weeks", 'start_date');
+		$this->assertTrue(true,'No fatal error on computing date');
+	}
+	/**
+	 * @covers DBObject::SetComputedDate
+	 * @return void
+	 */
+	public function testSetComputedDateOnAttributeDateTime(){
+		$oObject = MetaModel::NewObject(\WorkOrder::class, ['name'=>'Test workorder','description'=>'Toto']);
+		$oObject->Set('start_date','2024-01-01 09:45:00');
+		$oObject->SetComputedDate('end_date', "+2 weeks", 'start_date');
+		$this->assertTrue(true,'No fatal error on computing date');
+		$this->assertEquals("2024-01-15 09:45:00", $oObject->Get('end_date'), 'SetComputedDate +2 weeks on a WorkOrder DateTimeAttribute');
+
+	}
 }