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