Merge changes from topic "am-edf9624acfb54b4284910a75135d4e7a" into main

* changes:
  [automerger skipped] Merge "Fix allowlist token issues" into sc-v2-dev am: 34984a2e -s ours am: f9b6db53 -s ours am: 7ea99d70 -s ours am: 38ca7208 -s ours am: 9b09c639 -s ours am: e48e1aaa -s ours
  [automerger skipped] Fix allowlist token issues am: 5d107bcd -s ours am: f0157c59 -s ours am: 779a43d0 -s ours am: 67af561e -s ours am: 65cd8b23 -s ours am: 1537feb0 -s ours