Merge "Switches now have checked state"