Merge branch 'rg/copy-gecos-username' into maint