Updated table 1
Merge branch 'master' into officialTag