Merge "Merge "Make calls to yield() explicit" am: f63f82ecd8" into main-16k