Fix/4.0.x/exogtn 1819

https://jira.exoplatform.org/browse/EXOGTN-1819