Change in osmo-trx[master]: Do not merge: test commit for gerrit verfications