Bug related to CROSSDATA-270 fixed