Merge change 23474 into eclair

* changes:
  Breaking sleep after yield into small quanta.