Issues CROSSDATA-202 & CROSSDATA-203 solved
Finish CROSSDATA-202