Code

Merge branch 'maint' into jc/verify-pack-stat