Merge "Respect undeclared command line options"