osmo-trx.git branch ttsou/fixes updated. 7764ca94ce659dad840dc120bfb9b77be561ccbc