Merge "Data saver fixes" into nyc-dev