Merge branch 'np/malloc-threading' into maint