Fix
Removed fixme
Merge branch 'c3'
Merge github.com:Praqma/RoadShow-stable