Added test for #1890
Fixed #1890 variable in switch
Merge branch 'master' into 1890_for_spec_1119
Updated test for #1890
Minor code clean-up
Merge branch 'master' into 1890_for_spec_1119