Merge branch 'stats-with-unused-hw-axes' into 'master'

Stats: take into account unused hw axes in run count, refactor code

See merge request !121