Merge branch 'bl/scalable-allocations' into pu