Merge branch 'jb/parse-options-message-fix'