Merge "Support legacy apexdata labels"