Merge branch 'allocation-fixes' into integration