Merge "registration: Fix 'ResourceModules' in schema"