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

Closes CIT-6

Merge request reports