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

* changes:
  [automerger skipped] Merge "Fix heap-use-after-free issue flagged by fuzzer test." into sc-dev am: 85dc16dd -s ours am: 44def9fd -s ours am: 8eb17a5a -s ours am: 468db685 -s ours am: 5502ff24 -s ours am: dd7071cc -s ours am: a3fc652d -s ours am: 57f0db8a -s ours
  [automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: e376b3dd -s ours am: 04f5f72c -s ours am: 996f568e -s ours am: 8db2fe5d -s ours am: c41dd63b -s ours am: 26d355af -s ours am: 046465ca -s ours am: 78594574 -s ours