Merge branch 'ak/lazy-prereq-mktemp' into maint