Merge "Fix missing break"