Merge change 21653 into eclair

* changes:
  Remove global IO context and integrate it into the RS context.