Merge pull request #1505 from sfe-ev/disable_mandatory_tokens