Merge "Add convenience targets for switching between full, smart, interpret-only"