Resolve CIT-8 "12.0 "

Merged Jose Luis Zanotti requested to merge 12.0-CIT-8 into 12.0-stage

WIP CIT-8

Edited by Jose Luis Zanotti

Merge request reports