Merge "Treat APFv3 as APFv4 with not fully working counters." into main