Merge branch 'rr/diffcore-pickaxe-doc' into maint