Merge "Make calls to yield() explicit"