Merge "Fix and tune ProfileSaver" into nyc-dev