Merge branch 'sg/parse-options-subcommand'