case 2117 - Ebook streaming.
Merge remote-tracking branch 'origin/case-2117' into development