reuse allocation table
Merge branch 'master' into BCI