Prevented unnecessary reallocation of arrays.
Merge branch 'bffix' into stable_BtA