#366 Remove table-related tags
Merge branch 'version2.1' into version2.2