Merge branch '698-Fix-SBA-MSAN-issue-properly' into 'main'
[Non-BE] Fixing the SBA MSAN issue properly, with non-BE Switch in the right place See merge request !986
[Non-BE] Fixing the SBA MSAN issue properly, with non-BE Switch in the right place See merge request !986