Revert "Merge branch 'LAB-252' into '12.0'"

Merged Javier Vescio requested to merge revert-868fd197 into 12.0

This reverts merge request !205 (merged)

Merge request reports