Merge branch 'nv/parseopt-opt-arg'