Small update for CAF. This will not affect CM.