8.0 remove claim data

Merged Gabriel Davini requested to merge 8.0-remove_claim_data into 8.0-stage

Merge request reports