dynarr is not needed here
merging upstream
fixed build