Conditionals: switch, look-up, ternary, if with two (&&, ||) conditions
Merge origin/master