Merge branch 'eb/contacts-reported-by'