merge D2 push #461, fix Issue 9783