Merge branch '114-SBA-BR-switching-reconfig-cleanup' into 'main'

[Non-BE] Cleanup for SBA reconfigure functions.

See merge request !479