[IMP] Many improvements

Merged Jose Luis Zanotti requested to merge RR317 into 12.0-stage

Merge request reports