Merge branch 'tr/maint-parseopt-avoid-empty'