Merge branch 'holger/merge-msc-bsc-split'