BP Social compatibility
Merge branch 'develop'