diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 79b54b365..4cba640ee 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1330,6 +1330,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Year' => '%1$s (year)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index ff9e4f2ad..bd9728bb8 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1273,6 +1273,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Jour du mois pour %1$s',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (heure)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (mois)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Year' => '%1$s (année)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (jour de la semaine)',
 	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (jour du mois)',
 	'UI:DashletGroupBy:MissingGroupBy' => 'Veuillez sélectionner le champ sur lequel les objets seront groupés',
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 083bdff12..185e4fd83 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -513,6 +513,7 @@ return array(
     'Combodo\\iTop\\Forms\\Block\\IO\\Format\\ClassIOFormat' => $baseDir . '/sources/Forms/Block/IO/Format/ClassIOFormat.php',
     'Combodo\\iTop\\Forms\\Block\\IO\\Format\\NumberIOFormat' => $baseDir . '/sources/Forms/Block/IO/Format/NumberIOFormat.php',
     'Combodo\\iTop\\Forms\\Block\\IO\\Format\\RawFormat' => $baseDir . '/sources/Forms/Block/IO/Format/RawFormat.php',
+    'Combodo\\iTop\\Forms\\Block\\IO\\Format\\StringIOFormat' => $baseDir . '/sources/Forms/Block/IO/Format/StringIOFormat.php',
     'Combodo\\iTop\\Forms\\FormBuilder\\DependencyHandler' => $baseDir . '/sources/Forms/FormBuilder/DependencyHandler.php',
     'Combodo\\iTop\\Forms\\FormBuilder\\DependencyMap' => $baseDir . '/sources/Forms/FormBuilder/DependencyMap.php',
     'Combodo\\iTop\\Forms\\FormBuilder\\FormBuilder' => $baseDir . '/sources/Forms/FormBuilder/FormBuilder.php',
@@ -525,7 +526,6 @@ return array(
     'Combodo\\iTop\\Forms\\FormsException' => $baseDir . '/sources/Forms/FormsException.php',
     'Combodo\\iTop\\Forms\\IFormBlock' => $baseDir . '/sources/Forms/IFormBlock.php',
     'Combodo\\iTop\\Forms\\Twig\\Extension\\FormCompatibilityExtension' => $baseDir . '/sources/Forms/Twig/Extension/FormCompatibilityExtension.php',
-    'Combodo\\iTop\\ItopSdkFormDemonstrator\\Form\\Block\\ExpressionFormBlock' => $baseDir . '/sources/Forms/Block/Base/ExpressionFormBlock.php',
     'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
     'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 43ed66156..13c88f9cc 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -894,6 +894,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Forms\\Block\\IO\\Format\\ClassIOFormat' => __DIR__ . '/../..' . '/sources/Forms/Block/IO/Format/ClassIOFormat.php',
         'Combodo\\iTop\\Forms\\Block\\IO\\Format\\NumberIOFormat' => __DIR__ . '/../..' . '/sources/Forms/Block/IO/Format/NumberIOFormat.php',
         'Combodo\\iTop\\Forms\\Block\\IO\\Format\\RawFormat' => __DIR__ . '/../..' . '/sources/Forms/Block/IO/Format/RawFormat.php',
+        'Combodo\\iTop\\Forms\\Block\\IO\\Format\\StringIOFormat' => __DIR__ . '/../..' . '/sources/Forms/Block/IO/Format/StringIOFormat.php',
         'Combodo\\iTop\\Forms\\FormBuilder\\DependencyHandler' => __DIR__ . '/../..' . '/sources/Forms/FormBuilder/DependencyHandler.php',
         'Combodo\\iTop\\Forms\\FormBuilder\\DependencyMap' => __DIR__ . '/../..' . '/sources/Forms/FormBuilder/DependencyMap.php',
         'Combodo\\iTop\\Forms\\FormBuilder\\FormBuilder' => __DIR__ . '/../..' . '/sources/Forms/FormBuilder/FormBuilder.php',
@@ -906,7 +907,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Forms\\FormsException' => __DIR__ . '/../..' . '/sources/Forms/FormsException.php',
         'Combodo\\iTop\\Forms\\IFormBlock' => __DIR__ . '/../..' . '/sources/Forms/IFormBlock.php',
         'Combodo\\iTop\\Forms\\Twig\\Extension\\FormCompatibilityExtension' => __DIR__ . '/../..' . '/sources/Forms/Twig/Extension/FormCompatibilityExtension.php',
-        'Combodo\\iTop\\ItopSdkFormDemonstrator\\Form\\Block\\ExpressionFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/ExpressionFormBlock.php',
         'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
         'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
diff --git a/sources/Forms/Block/DataModel/OqlFormBlock.php b/sources/Forms/Block/DataModel/OqlFormBlock.php
index 53097773e..37e3c748d 100644
--- a/sources/Forms/Block/DataModel/OqlFormBlock.php
+++ b/sources/Forms/Block/DataModel/OqlFormBlock.php
@@ -10,6 +10,7 @@ use Combodo\iTop\Forms\Block\Base\TextAreaFormBlock;
 use Combodo\iTop\Forms\Block\FormType\OqlFormType;
 use Combodo\iTop\Forms\Block\IO\Converter\OqlToClassConverter;
 use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
+use Combodo\iTop\Forms\Block\IO\Format\StringIOFormat;
 
 /**
  * Form block for oql expression.
@@ -20,6 +21,7 @@ class OqlFormBlock extends TextAreaFormBlock
 {
 	// outputs
 	public const OUTPUT_SELECTED_CLASS = 'selected_class';
+	public const OUTPUT_OQL = 'oql';
 
 	/** @inheritdoc */
 	public function GetFormType(): string
@@ -32,6 +34,7 @@ class OqlFormBlock extends TextAreaFormBlock
 	{
 		parent::InitOutputs();
 		$this->AddOutput(self::OUTPUT_SELECTED_CLASS, ClassIOFormat::class, new OqlToClassConverter());
+		$this->AddOutput(self::OUTPUT_OQL, StringIOFormat::class);
 	}
 
 	/** @inheritdoc */
diff --git a/sources/Forms/Block/IO/Format/StringIOFormat.php b/sources/Forms/Block/IO/Format/StringIOFormat.php
new file mode 100644
index 000000000..6a744c7c3
--- /dev/null
+++ b/sources/Forms/Block/IO/Format/StringIOFormat.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\Forms\Block\IO\Format;
+
+use JsonSerializable;
+
+class StringIOFormat implements JsonSerializable
+{
+	public string $sValue;
+
+	public function __construct(string $sValue)
+	{
+		$this->sValue = $sValue;
+	}
+
+	public function __toString(): string
+	{
+		return $this->sValue;
+	}
+
+	public function jsonSerialize(): mixed
+	{
+		return $this->sValue;
+	}
+}
\ No newline at end of file