Merge branch 'knip_hist1d'
Merge branch 'optimized-ops'