Merge pull request #2352 from joto/metatables #1363

Job	Run time
ubuntu-test-install (public)	3m 5s
ubuntu-test-install (middle_schema)	3m 14s
	6m 19s

Provide feedback