development: Comparison tweak
development: Merged with master to obtain shStream