Merge pull request #7052 from illume/upstream-simpletable-overflow-0055