Merge "No longer keep track of contacts affinity (2/4)"