Mod disc switch point
Discr sw points
Merge branch 'unstable' into rosenunstable
new cat of disc sw