Merge Review Discussion

Diff to discuss the merge
We might do not need SHAREDROP