updated ConfigSamples for new switch system
Merge remote-tracking branch 'upstream/edge' into edge