Fix non-registry directories not being recognised in routing
Merge URL rewriting hotfix