Merge branch 'lt/maint-diff-reduce-lstat'