sync the changes of the upstream to avoid build failure