honour resolved aliases when scanning directories
Merge branch 'i507'