Fixed tx sha creation
Merge branch 'master' into develop