merged streaming fix from RC_0_16