another try at streampage
Merge remote-tracking branch 'origin/feature/streampage' into staging