Merge branch 'rs/archive-parse-options'