Merge "Fix help for --only: override doesn't work with CamelCase"