Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint