Merge pull request #13617 from PolynomialDivision/sipcalc