Merge "Rewrite command line option parsing"