Merge branch 'st/mv-lstat-fix'