JC-1538 in progress (adding new contact tooltip fixed)
Merge remote-tracking branch 'origin/master'