13 Commits (ui-fixes-2025-06-w2)