BPHY24 Fix

I think in my original merge request my local and remote branch weren't synced so the merge missed some commits.

This will hopefully fix the failure in ART.