Code

Merge branch 'rc/histogram-diff'