Sync-up PR for changes to fix SOCIAL-356 and SOCIAL-341