Merge branch 'iu/fix-parse-options-h-comment' into maint