Merge HWA version into main MFX