MFI-9: Updated to the same state as my git repository.
Authored by: andgi 2025-05-31
Parent: [r12976]
Child: [r12978]