Merge "Handle exceptions when reading flag values from new storage" into main