Merge pull request #2131 from sjpadgett/portal-tables