Merging cleanup into features/binning.
Merging features/binning into release.