Revert "Merge branch 'revert-a2712323' into 'master'"

What does this MR do and why?

Revert "Merge branch 'revert-a2712323' into 'master'"

This reverts merge request !200001 (merged)

#TODO reverting MR as is not safe, we need to revert the reversal MR

References

Screenshots or screen recordings

Before	After

How to set up and validate locally

MR acceptance checklist

Evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.