merged v4.57 of upstream