Merge branch 'sb/histogram-less-memory'