8.0 pick type cai

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

Merge request reports