bug fix
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
merge
bug fix