Merge branch 'fn/maint-mkdtemp-compat' into maint