CA Cleanup for ACF2 12.1 compatibility with z13 hardware.