Adding logic for CROSSDATA-344
Merge with local branch
Resolves CROSSDATA-344