Fix issue CROSSDATA-111
Finish CROSSDATA-111