Change Details

Use BFI if it is available and BPI otherwise. This is a promised follow-up after D89451.

Use BFI if it is available and BPI otherwise. This is a promised follow-up after D89541.

Use BFI if it is available and BPI otherwise. This is a promised follow-up after D89451D89541.