Merge "Fixes failing test after coroutine lib upgrade." into main