Merge branch 'hyp-alloc-v5' into dyn-vmemmap