merge change from master stream:fix GF32892