feat/expanded route parsing capabilities (#5369)

2 files changed