Merge branch 'jc/report-path-error-to-dir' into maint