Implementing solution for CROSSDATA-293
Resolves CROSSDATA-293
Finish CROSSDATA-293