Fix/4.0.x/soc 4118

https://jira.exoplatform.org/browse/SOC-4118