am 10572edb: Merge "Routing workaround." into jb-mr2-dev

* commit '10572edbbaa5176518bf8831913b3839e5f95b7f':
  Routing workaround.
tree: 2ca1681d09460993b59bb7ba60e659411d0d238f
  1. core/
  2. services/