Merge changes from topic "am-2b86de01a1b345ccb8a3e8bb1f41bfb5" 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: 2e786809 -s ours am: d356d8ab -s ours am: e63468a2 -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: 297f2488 -s ours am: 87b9c33c -s ours am: 99501950 -s ours