[dm] sync with Mike