Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Added feature counts for 3 WebSocket streams