Merge commit '820232af1b70bc20a24afedc7533a1068d733e64' * commit '820232af1b70bc20a24afedc7533a1068d733e64': allow delaying after yielding
Merge commit '820232af1b70bc20a24afedc7533a1068d733e64' * commit '820232af1b70bc20a24afedc7533a1068d733e64': allow delaying after yielding