Merge changes for leaner memory footprint