## Validator Changes
* no changes
## Other code changes
* Fix for handling large expansions correctly