Merge "Move ArtField to native"