merge D2 pull #1626