Merge "Multi-user Data Saver fixes:" into nyc-dev