Update th-desguar from upstream.