Fix/4.0.x/plf 5419

https://jira.exoplatform.org/browse/PLF-5419