Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster-yield

Replace (slower) block.call with (faster) yield