* Text Ellipsis for Icon Mapping Text in the UI
Merge remote-tracking branch 'origin/master'