Merge branch 'jn/parse-options-extra'