Merge from Baiqin
fix