Merge "Set routes from stacked links as well." into jb-mr2-dev
tree: 1f5d0e6de237cdd3f6b62b78a2dd6a81c6c870cb
  1. core/
  2. services/