Merge "Count switch as branch." into pi-dev