Merge "Add default case to switch statment" into main