Merge changes from topic "am-7a8e05ad9b264e399f2234c935972984" 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: 56ec7712 -s ours am: 56db6ec7 -s ours am: a3c54e20 -s ours am: f416c02b -s ours am: ca9173a7 -s ours am: 08d2e466 -s ours
  [automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: d0645e1c -s ours am: 99614f0a -s ours am: e1f7f347 -s ours am: 9df9cdbd -s ours am: a423422a -s ours am: 0a197726 -s ours am: 1c009819 -s ours am: f760b5d2 -s ours