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