merged v3.89 of upstream