Merge branch 'bug/JAL-2046_ds_sharing_features_broken' into develop