Merge branch 'ak/extract-argv0-last-dir-sep' into maint