case 2802 - Easy social blocks.
Merge branch 'case-2802' into develop