Merge branch 'jk/diffcore-break-divzero' into maint