Fix/2.3.x/ecms 4453

https://jira.exoplatform.org/browse/ECMS-4453