Merge branch 'rs/parse-options-lithelp-help'