Merge "Cleanups on refresh flags"