Claim pack notes updates
Merge remote-tracking branch 'origin/dev-claimpack' into dev-claimpack