CRM-15287 - Fix shared address behavior