T3043

Merged diego.barreto requested to merge T3043 into 15.0-preStable

This reverts commit 1d9c40f2.

Merge request reports