osmo-trx.git branch fairwaves/master updated. 3531a6a6ac36e59c41a93cd9e07ae4cc1529522f