Merge "Make routing type an enum instead of boolean"