12 Commits (fix/ai-roadmap)