Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'