Merge branch 'bc/prune-info' into maint