Merge branch 'use-trunc-rounding' into rounding-fixes