Removed some transactions as it is locking a table
Merge branch 'develop'