Merge branch 'mm/mkstemps-mode-for-packfiles' into maint