Implementing solution for feature CROSSDATA-317
Resolves CROSSDATA-317
Merge branch 'feature/CROSSDATA-317' into develop