fix

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

Closes CIT-8

Merge request reports