Merge branch 'tk/diffcore-delta-remove-unused' into maint