Merge 'fixeria/trx' into master