changes and unit tests
Merge branch 'aggregate-reset-4.1' of https://github.com/alprs/framework into alprs-aggregate-reset-4.1
Add space.