Beam switching small fixes

Francesco Manirequested to merge
prevent_beam_switch into develop

To prevent activation of beam switching when not required

Merge request reports