Merge "Replace the way to add legacy routing"
tree: 56079e6a8716181141bef96aecd7ddecbbd1f759
  1. core/
  2. services/
  3. tests/