Adding feature
Merge github.com:Praqma/RoadShow-stable
Applied c1
Added missing unit test for feature