merge check-tables from master