Treat invalid url as 404, when allowed domains are config'd too
Merge branch 'stage'