Merge branch 'development' into feature-social
Bug fix in the new social feature with latest plugins
Merge branch 'feature-social' into development