Improve transaction and entry ordering
Merge branch 'master' into 'python'