Merge "Fix for text highlight." into devel/master