Bp4 fix streaming

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/bp4-fix-streaming into release

Created by: chuckatkins

Re-targeting #1773 to the release branch

Merge request reports