Merge "Move away from deprecated "_data" column."