merge D2 pull #1552