Merge branch 'feature/local-mscs'