Fix missing yields (OMS-345)
Merge branch 'oms-345'