Merge branch 'holger/bsc-msc-separation'