Bastion: ensure tables are properly scoped, fixes #3385.
Merge pull request #3391 from waldenraines/bug-3385

Bastion: ensure tables are properly scoped, fixes #3385.