Merge "Remove implicit fallthrough exception"