ECMS-4667

Signed-off-by: Houssem NJAH <njah.houssem@exoplatform.com>