merged v3.84 of upstream