The AS7-4331 fix depends on legacy API (package structure)