Draft: F alexandrov/alter system followup

Summary

• wip: alter system

• wip: alter system follow up changes

---

• Close #...
• Changes should be cherry-picked to 24.2: yes / no
• Docs follow-up: not necessary / new issue