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