Merge branch 'dsa-multi-swtich'