RISTRETTO-30: Scaling corrections.

Also fixes RISTRETTO-14.
2 jobs for !8 with bugfix/ristretto-30-scaling-corrections in 1 minute and 23 seconds (queued for 3 seconds)
latest detached
Status Job ID Name Coverage
  Build
passed #5421
build

00:00:37

 
  Distcheck
passed #5422
distcheck

00:00:45