Pluralized table
Updated relevant bits
Merge branch 'release/0.20.4' into develop