First approach for issue CROSSDATA-152
Code added for CROSSDATA-152
Finish CROSSDATA-152