Tabs can be added to contact pages, changes still needed.
Merge remote-tracking branch 'origin/master'