Merge branch 'cr/reset-parseopt'