Final Tables and Charts, redux on the output page
Merge remote-tracking branch 'origin/develop' into develop