Merge "Adjust ProfileSaver strategy"