Client Data Changes for Graveyard Reset part 2
Merge branch 'GYDeathFix' into stable-test