7360 table review

Fixes gh-7360