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