XXX assert fixes
XXX document claimUpgrade
XXX document client upgrade support