merge fix from RC_0_16
back-ported choking issue at high uplod rates