Merge branch 'hv/config-from-blob'