Merge "separate transactions from updates"