Merge changes from topic "am-7f1bb6ed9b144ac588b50c795b3b31ab" 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: 599f5f7b -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: e6bb808f -s ours