Merge pull request #336 from ariard/2019-04-in-flight-txn-tracking-clean