Merge "Add zoned device support"