Removed hack for shared transaction.
Merge branch 'remove_shared_trans_hack' into develop