Jira Issue CROSSDATA-112 fixed