Merge "Revert "CP partial ag/26460595 for coroutine instance."" into 24D1-dev