Merge branch 'slim/17585' into slim/17586

# Conflicts:
#	apps/server/src/updates/UpdateWindow.ts
d227f0ee7fmaria-rcks committed on 10/20/2026, 11:37:51 PMparentse4790eb776ce22
3 files changedLine totals unavailable