Merge HWA into main MFX
Stuff