am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
  Be careful sharing connections when dun is in play