Imported branch stable-202507 of upstream 20250729