Merge branch 'sb/parseopt-boolean-removal'