Merge branch 'jn/config-ignore-inaccessible' into maint