We need to do a small refactoring to get rid of code duplications caused by streaming endpoints introduction in #735 epic

Check out these PRs to understand the code similarities
#762
#760
#758

Note: it should be done after those PRs are merged in