Merge "fix(errata-abi): add support for handling split workarounds" into integration