osmo-trx.git branch fairwaves/625 updated. 2518186b450c17382e2cd9adca912fb3cf7c41ec