Merge changes from topic "label_core_data"

* changes:
  Correctly label data types
  Test that /data is properly labeled