merged v4.67 of upstream