fix/1.12.14-GA/JCR-1829

Fix for https://jira.exoplatform.org/browse/JCR-1829