Merge "Text - Fix for text controller." into devel/master