[SE-728] claim development

Merged Luciano Ortiz requested to merge SE-728 into 8.0-stage

Closes SE-728

Merge request reports