allow case change on scene/source names
Remove duplicate switch case from previous merge
Merge remote-tracking branch 'upstream/master'