issue #19550: Add more calculations and rounding.