Merge branch 'fix/streaming-termination-errors' into 'develop'