Merge branch 'dev' into feature/tui-assistant-tokens-per-second