Merge branch 'rs/parse-opt-lithelp'