many changes to tables and layouts
Merge remote-tracking branch 'upstream/master'