Minor fix to data-friendly labels for automated tests
Revert "Minor fix to data-friendly labels for automated tests"

This reverts commit af4e0ef6c5c5e41e4a9cc04fcb501a9ea6a9de25.
Minor fix to data-friendly labels for automated tests
Merge branch 'qa' into develop

* qa:
  Minor fix to data-friendly labels for automated tests
  Revert "Minor fix to data-friendly labels for automated tests"
  Minor fix to data-friendly labels for automated tests