Merge "Fix missing capability cli models."