Today
Merge from rust_companion_boot_fixes