Verbesserungen gemerged 'counting-consumer' -> 'endless-stream-consumer'