Issue CROSSDATA-192 resolved