Merge branch 'jk/diffcore-break-divzero'