merged  injected routes fix from upstream, 3.1.1