[BUG] Bugfix

Merged Jose Luis Zanotti requested to merge SE-835 into 12.0-stage

Closes SE-835

Merge request reports