Merge branch 'switch' into edge