Merge branch 'jk/ident-loosen-getpwuid' into maint