Merge 'fix_communications_view' to 'master' branch