Replace fixed width of tables with dynamic configuration
Merge remote-tracking branch 'upstream/master'