Refs #9669. MaskBTP for Corelli
Merge remote branch 'origin/feature/9669_CorelliMaskBTP'