Merge "Text - Ellipsis improvement." into devel/master