Add stream "plugin" (alias of "plugins")
Merge remote-tracking branch 'origin/develop' into develop