Merging master and streaming branches