Revert "Merge branch 'T2317' into 'main'"

Merged Javier Vescio requested to merge revert-0eba9287 into main

This reverts merge request !28 (merged)

Merge request reports