Sharing implementation
Merge branch 'feature/sharing' into develop