11.0 merge

Merged Ariel Caruso requested to merge 11.0-merge into 11.0

Merge request reports