[Non-BE] Fixing the SBA MSAN issue properly, with non-BE Switch in the right place See merge request !986