Merge the varopti memory improvements