Correct close last open case statement in switch statement
Merge branch 'open-case'
Merge remote-tracking branch 'remotes/origin/master'