Validate the session rebates unit
Support hashing by numbers and by strings
Merge from upstream