Merge branch 'pw/add-p-recount' into maint