Integer overflow causes negative collection cache memory size.
Merge branch 'hotfix/2.1.1'