Fix switch statement
Merge branch 'refs/remotes/origin/patch-44'
Test