Merge "Set routes from stacked links as well." into jb-mr2-dev