Change metadata loading to be dynamic.
Merge branch 'metadata-dynamic-loading' into metadata-support