Code

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