Merge "Fix error in Histogram test" into lmp-dev