Merge branch 'ab/parse-options-cleanup'