Merge "Fix switch fall-through bug"