Merge branch 'master' into oms-392
Fix another double tpc_begin call exception condition (OMS-392)
Merge branch 'oms-392'