F1 fixes for interoperability with Accelleran CU

same as MR !1698 (merged). (which is not merged into develop, do not believe gitlab!)

I messed up badly, so I need to do a new MR...