Resolves CROSSDATA-85
Finish CROSSDATA-85
Merge remote-tracking branch 'origin/develop' into develop