Merge pull request #4068 from rabuzarus/20171215_-_frio_fix_contact_list