Minor fixes to tech-roadmap
Merge "Minor fixes to tech-roadmap"