Table refactor, dev-freeze fixes.

Duplicate of #7517, github diff is being stupid again.