Ready to test manually
Merge with local branch
CROSSDATA-240 resolved