Merge changes from topic "am-8a632f4a5c47478ba54d772255b769f1" into main

* changes:
  [automerger skipped] Merge "Fix heap-use-after-free issue flagged by fuzzer test." into sc-v2-dev am: e9463eab -s ours am: beaccbb2 -s ours am: 7af29404 -s ours am: b634595d -s ours am: afd45675 -s ours am: 7c393fe7 -s ours am: 628d9c31 -s ours
  [automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: d0645e1c -s ours am: 99614f0a -s ours am: 604caf04 -s ours am: 1a35ceaa -s ours am: eb194138 -s ours am: 3c310335 -s ours am: 52c7153f -s ours