Merge "Add routing type flags" into main