Issue CROSSDATA-116 fixed