manual merge stream from beta to master