Merge branch 'zecke/osmo-bsc'