Re #8168. Added optional MaskBinsTable to the mix.
Merge remote branch 'origin/feature/8168_maskbintable'