Merge changes from topic "am-d1ef6ebc693c42189eb6d11e35310334" 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: 3f0180b3 -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: f06babfe -s ours