Merge "Fix for text's highlight box." into devel/master