Update transactions fetch due to api change
merge from origin master