Merge proposals dependent on lp://staging/~thomas-voss/biometryd/calculate-statistics-for-cmd-test

1. calculate-statistics-for-cmd-test
2. Dependent merge proposals