Issue CROSSDATA-221 resolved