Merge branch 'cb/array-size' into maint