Removed explicitly shared
Merge branch 'development'