Merge pull request #2339 from joto/hex-refactor #1341

Job	Run time
ubuntu-test-install (public)	3m 57s
ubuntu-test-install (middle_schema)	3m 21s
	7m 18s

Provide feedback