Merge "Missing break in switch statement"