Merge "Add ext4 support"