Merge "Fix bug in stats output for HBD."