Merge branch 'jn/unpack-lstat-failure-report' into next