Modifications to get the ResolvedValueSetDefinition loader to work
Merge remote-tracking branch 'origin/master'