Merge changes from topic "am-a32172274c824525bd0cd3b9a602abfe" 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: a737f576 -s ours am: 6af58196 -s ours am: 73731ca9 -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: de7b1bff -s ours am: 488d9e78 -s ours am: 95e9cfb8 -s ours