Add conditional as caf variant
Fix build in cm tree