Revert "Revert "Merge branch '11.0-dev' into '11.0'""

Merged Luciano Ortiz requested to merge revert-8362ec0c into 11.0

This reverts commit 8362ec0c

Merge request reports