[BF] Begun a transaction (unnecessarily) that was not ended
Merge branch 'master' into inex-live