Restore contact tag display
Catch up to master
Update tests
Merge remote-tracking branch 'upstream/tagscc' into tagscc