Update devenv
Update router
Merge branch 'master' into dev