Merge "Routing workaround." into jb-mr2-dev
tree: 2ca1681d09460993b59bb7ba60e659411d0d238f
  1. core/
  2. services/