Merge branch '698-msan-additional-fix' into 'main'

[Non BE] Fix for MSAN issue under CR_FIX_698_SBA_MSAN

See merge request !982