Improved roadmap
Merge branch 'roadmap-fix' into develop