Refactor the way transactions are handled
Merge branch 'develop' into feature/refactor-transaction
Merge branch 'feature/refactor-transaction' into develop