Merge change 25382 into eclair

* changes:
  Fix async calls with Connect And Disconnect Sink.