L2SS-2368: Pull forward changes to BF_File from main

If desirable to speed things up

Merge request reports

Loading