Merge "Routing workaround." into jb-mr2-dev