Merge "Discard corrupted or out of date profiles" into nyc-dev