Merge 4c17a5562b into 7.2 drivedb.h branch only.
Authored by: chrfranke 2025-06-16
Parent: [r5719]
Child: [r5721]