Issue #8561 by tj, Added missing tables