Fix/4.0.x/ecms 5675

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