Merge branch 'fix-list-stream-privacy' into 'develop'