Planned for 26.05

Sorted by priority