Fix demo load path for registry
Resolve merge conflict merging master into v3