Fix overlaps. Reduce EE.
Revert Tracker changes.
Revert Tracker changes.
Revert Tracker changes.
Merge pull request #2677 from ianna/include-me0-in-2023-scenario

Fix overlaps. Reduce EE.