Sync-up PR for changes to fix SOCIAL-358