BD-1927 issues https://jira.exoplatform.org/browse/BD-1927