Revert "Merge branch 'cherry-pick-7ac8e711' into '15.0'"

Merged Joel Maglioni requested to merge revert-0df7bce3 into 15.0

This reverts merge request !193 (merged)

Merge request reports