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
Bump version