Merge branch 'endless-stream-producer' into rest-producer