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