CROSSDATA-342 done and some modifications for CROSSDATA-341