Merge "Added support of zoned array data types"