am ef5af8f4: am 9f78e2bd: am 1ceba204: am 868fffca: am ae07c2be: Fix directory lookups

* commit 'ef5af8f481d2312efea4926c662034342f500b1c':