reduce memory footprint
Merge branch 'master' into de3005