Flow fixes between clips and streams
Merge branch 'master' into squares