Speculative fix for double-begin_tpc exception (OMS-345)
Merge branch 'oms-345'
Another speculative fix... (OMS-345)
Fix mistakes in the previous commit (OMS-345)
Fix inlineCallbacks usage (OMS-345)