merge the official update

merge the official update