Merge "Add flags for caching Profiles data" into main