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