Re #1396 - HasMet is now a ResourceType
Merge origin/master