osmo-trx.git branch fairwaves/master-rebase updated. ea77f6d3858c1ec30d5bf11107203b8136d73ddb