Fix/4.0.x/ecms 6238

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