case 2802 - Easysocial block.
Merge branch 'case-2802' into develop