am b545eaa9: Merge "separate transactions from updates"

* commit 'b545eaa9cbe39b8209a40044aa0a5f00846278d4':
  separate transactions from updates