Improved distinct color stream.
Merge remote-tracking branch 'origin/substantial-refactoring' into substantial-refactoring