Revert "Committing datasharing"

This reverts commit f8ef653cb97ba219c804e712a8e7584b09c8b4bd.
Revert "Revert "Committing datasharing""

This reverts commit 99961a0953160b873ae75f70d53ab7c293643ae8.