osmo-trx.git branch fairwaves/625 updated. f6ec7be7c5666e7162861ad3f9b9dc19f96fb2f4