Fixes for Displaying results.
Merge branch 'release/v2.1.1'