merge D2 pull #2069