quick directive fix
Redirect to root page when resource not found
Merge branch 'master' into MYG000-170-171-173