Imported branch stable-202601 of upstream 20260109