Issue CROSSDATA-108 solved