Merge big switch changes