PRD-4841 - Table layouts started failing due to more state errors as
previously underutilized code jumps to life.
Merge pull request #341 from tmorgner/PRD-4841

PRD-4841 - Table layouts started failing due to more state errors as