Re-use matched route params when generating links
Merge branch 'hotfix/reuse-matched-route-params'