Merge branch 'rs/describe-parseopt-fix'