Merge "Add cmdline option parsing support"