No more regex in keyword router.
Merge branch 'develop' into develop-frontend