Merge "Be careful sharing connections when dun is in play" into ics-mr1