Bring in sync with maintenance/tables.sql