issue #20332: fix to customer-contact relationship