Some modifications for issue CROSSDATA-153
Merge with local branch