fix bug
fix bug
Merge remote-tracking branch 'origin/0.49' into 0.49