Speculative fix for double-begin_tpc exception (OMS-345)
Merge branch 'oms-345'