Merge branch 'nd/diff-parseopt'