Merge "Replace the way to add legacy routing"