Merge branch 'ne/pack-local-doc' into maint