Revert "Merge branch 'ATR-menuFixesV2_dzanzi' into 'master'"
This reverts merge request !50553 (merged) due to interference with !50454 (merged).
Fixes ATR-24989.
This reverts merge request !50553 (merged) due to interference with !50454 (merged).
Fixes ATR-24989.