Fix insufficient_funds error on transfers with sufficient balance
merge insufficent funds patch