Removed explicit share
Merge branch 'development'