Fix transaction db
Merge branch 'develop' into devshares