Merge changes from topic "am-dc490560ae654a008adba022d8b593fb" into main

* changes:
  [automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into sc-dev am: 6bf6401b -s ours am: 648cdbba -s ours am: d5aa7e9b -s ours am: deb5bb72 -s ours am: 1c13c9a0 -s ours am: 9238e6af -s ours am: b670a77a -s ours am: af521175 -s ours
  [automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 38a83cae -s ours am: bebad5c1 -s ours am: 862a4a94 -s ours am: 1382db88 -s ours am: dad36a84 -s ours am: f45485ed -s ours am: 607b4282 -s ours am: dbeddc0a -s ours