Revert "Merge branch 'T2587' into 'main'"

Merged Javier Vescio requested to merge revert-6e255093 into main

This reverts merge request !39 (merged)

Merge request reports