Default tables changed
Merge remote-tracking branch 'ej/master' into behavior