32-bit compatible: 700MB+200MB
Merge branch 'core' into enterprise