Merge branch 'rs/nth-switch-code-simplification'