Merge branch 'lt/dirwalk' into next