Merged updates for beam_stopper, harp_generic, and scaler