Merge branch 'kb/lstat-cache'