Merge remote branch 'origin/bugfix/9657_beam_monitor_race'
Refs #9669. MaskBTP for Corelli
Merge branch 'feature/9669_CorelliMaskBTP' into develop