Updated for CAF Krait optimization support.