Merge branch 'km/send-email-getopt-long-workarounds' into maint