Merge "FTL: Yield futures without overhead" into tm-dev