Merge branch 'lt/preload-lstat'