resource_registration.md (uma)
Merge remote-tracking branch 'origin/master'