Merge branches 'feature/no-voidstar' and 'feature/multidimensional-arrays' into next