Merge branch 'jn/parse-options-extra' into next