Merge branch 'rs/parse-options-cmdmode'