GCP-5599 fix issue with measurement dataset type