Merge branch 'bugfix/1543-streaming-boosts' into 'develop'