Merge branch 'rs/calloc-array'