Merge "Diff array types"