Revert "Merge branch '15.0-fixes' into '8.0'"

Merged Jose Luis Zanotti requested to merge revert-1a46b5b6 into 8.0

This reverts merge request !158 (merged)

Merge request reports