Sync changes from branch v2024dev3
In order to have a clean history sync v2024dev3 with v2025dev1, while doing that, revert a change that was introduced by mistake.
In order to have a clean history sync v2024dev3 with v2025dev1, while doing that, revert a change that was introduced by mistake.