more simple stream-clone preparation

Merged Pierre-Yves David requested to merge topic/default/stream-clone.v3.pre into branch/default

Merge request reports