Merge "SpecialResetTokens: Use Config instead of globals"