fix data format trx
merge from origin master