Merge change 23067 into eclair

* changes:
  allow delaying after yielding