merged v4.41 of upstream