merged v5.20 of upstream