Merge branch 'jk/avoid-unbounded-alloca' into maint