Bug 917740

Review and update of the code supporting 'Support contacts'. Code rebased.