Sync-up PR for changes to fix SOCIAL-356, SOCIALFB-88 and SOCIALFB-118